diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index 73de9cf..0b64fe3 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -1,5 +1,5 @@
 group "default" {
-  targets = ["5.3.0", "5.3.1", "5.3.2", "5.4.0", "5.4.1", "5.4.2", "5.5.1", "5.5.3", "5.6.0", "5.6.1", "5.6.2", "5.7.0", "5.7.1", "5.7.2", "5.8.0", "5.8.1", "5.8.2", "5.8.3", "5.9.0", "5.9.1", "5.9.2", "5.9.3"]
+  targets = ["5_3_0", "5_3_1", "5_3_2", "5_4_0", "5_4_1", "5_4_2", "5_5_1", "5_5_3", "5_6_0", "5_6_1", "5_6_2", "5_7_0", "5_7_1", "5_7_2", "5_8_0", "5_8_1", "5_8_2", "5_8_3", "5_9_0", "5_9_1", "5_9_2", "5_9_3"]
 }
 
 target "build-dockerfile" {
@@ -14,7 +14,7 @@ target "build-common" {
   pull = true
 }
 
-target "5.3.0" {
+target "5_3_0" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.3.0"]
   args = {
@@ -22,7 +22,7 @@ target "5.3.0" {
   }
 }
 
-target "5.3.1" {
+target "5_3_1" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.3.1"]
   args = {
@@ -30,7 +30,7 @@ target "5.3.1" {
   }
 }
 
-target "5.3.2" {
+target "5_3_2" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.3.2", "docker.io/nlss/wordpress:5.3"]
   args = {
@@ -38,7 +38,7 @@ target "5.3.2" {
   }
 }
 
-target "5.4.0" {
+target "5_4_0" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.4.0"]
   args = {
@@ -46,7 +46,7 @@ target "5.4.0" {
   }
 }
 
-target "5.4.1" {
+target "5_4_1" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.4.1"]
   args = {
@@ -54,7 +54,7 @@ target "5.4.1" {
   }
 }
 
-target "5.4.2" {
+target "5_4_2" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.4.2", "docker.io/nlss/wordpress:5.4"]
   args = {
@@ -62,7 +62,7 @@ target "5.4.2" {
   }
 }
 
-target "5.5.1" {
+target "5_5_1" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.5.1"]
   args = {
@@ -70,7 +70,7 @@ target "5.5.1" {
   }
 }
 
-target "5.5.3" {
+target "5_5_3" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.5.3", "docker.io/nlss/wordpress:5.5"]
   args = {
@@ -78,7 +78,7 @@ target "5.5.3" {
   }
 }
 
-target "5.6.0" {
+target "5_6_0" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.6.0"]
   args = {
@@ -86,7 +86,7 @@ target "5.6.0" {
   }
 }
 
-target "5.6.1" {
+target "5_6_1" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.6.1"]
   args = {
@@ -94,7 +94,7 @@ target "5.6.1" {
   }
 }
 
-target "5.6.2" {
+target "5_6_2" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.6.2", "docker.io/nlss/wordpress:5.6"]
   args = {
@@ -102,7 +102,7 @@ target "5.6.2" {
   }
 }
 
-target "5.7.0" {
+target "5_7_0" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.7.0"]
   args = {
@@ -110,7 +110,7 @@ target "5.7.0" {
   }
 }
 
-target "5.7.1" {
+target "5_7_1" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.7.1"]
   args = {
@@ -118,7 +118,7 @@ target "5.7.1" {
   }
 }
 
-target "5.7.2" {
+target "5_7_2" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.7.2", "docker.io/nlss/wordpress:5.7"]
   args = {
@@ -126,7 +126,7 @@ target "5.7.2" {
   }
 }
 
-target "5.8.0" {
+target "5_8_0" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.8.0"]
   args = {
@@ -134,7 +134,7 @@ target "5.8.0" {
   }
 }
 
-target "5.8.1" {
+target "5_8_1" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.8.1"]
   args = {
@@ -142,7 +142,7 @@ target "5.8.1" {
   }
 }
 
-target "5.8.2" {
+target "5_8_2" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.8.2"]
   args = {
@@ -150,7 +150,7 @@ target "5.8.2" {
   }
 }
 
-target "5.8.3" {
+target "5_8_3" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.8.3", "docker.io/nlss/wordpress:5.8"]
   args = {
@@ -158,7 +158,7 @@ target "5.8.3" {
   }
 }
 
-target "5.9.0" {
+target "5_9_0" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.9.0"]
   args = {
@@ -166,7 +166,7 @@ target "5.9.0" {
   }
 }
 
-target "5.9.1" {
+target "5_9_1" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.9.1"]
   args = {
@@ -174,7 +174,7 @@ target "5.9.1" {
   }
 }
 
-target "5.9.2" {
+target "5_9_2" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.9.2"]
   args = {
@@ -182,7 +182,7 @@ target "5.9.2" {
   }
 }
 
-target "5.9.3" {
+target "5_9_3" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
   tags     = ["docker.io/nlss/wordpress:5.9.3", "docker.io/nlss/wordpress:5.9", "docker.io/nlss/wordpress:latest"]
   args = {