diff --git a/docker-bake.hcl b/docker-bake.hcl
index a0324ec..68851ec 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -62,9 +62,9 @@ target "documentserver-stable" {
     platforms = ["linux/amd64", "linux/arm64"]
     args = {
         "TAG": "${TAG}"
-        "PRODUCT_EDITION": "${PRODUCT_EDITION}"
-        "PRODUCT_NAME": "${PRODUCT_NAME}"
         "COMPANY_NAME": "${COMPANY_NAME}"
+        "PRODUCT_NAME": "${PRODUCT_NAME}"
+        "PRODUCT_EDITION": "${PRODUCT_EDITION}"
     }
 }
 
@@ -74,9 +74,9 @@ target "documentserver-nonexample" {
     tags = [ "docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PREFIX_NAME}${PRODUCT_EDITION}:${TAG}-nonexample" ]
     platforms = ["linux/amd64", "linux/arm64"]
     args = {
-        "PRODUCT_NAME": "${PRODUCT_NAME}"
-        "COMPANY_NAME": "${COMPANY_NAME}"
-        "PRODUCT_EDITION": "${PRODUCT_EDITION}"
         "TAG": "${TAG}"
+        "COMPANY_NAME": "${COMPANY_NAME}"
+        "PRODUCT_NAME": "${PRODUCT_NAME}"
+        "PRODUCT_EDITION": "${PRODUCT_EDITION}"
     } 
 }