diff --git a/Dockerfile.non.example b/Dockerfile.nonExample
similarity index 86%
rename from Dockerfile.non.example
rename to Dockerfile.nonExample
index 7a2a54c..82714bc 100644
--- a/Dockerfile.non.example
+++ b/Dockerfile.nonExample
@@ -1,6 +1,8 @@
+### Arguments only for FROM instruction ### 
 ARG PRODUCT_EDITION=
+ARG TAG=
 
-FROM onlyoffice/documentserver${PRODUCT_EDITION}:latest as onlyoffice/documentserver${PRODUCT_EDITION}-nonExample
+FROM onlyoffice/documentserver${PRODUCT_EDITION}:latest as documentserver-nonexample
 
 ARG COMPANY_NAME=onlyoffice
 ARG PRODUCT_NAME=documentserver
diff --git a/docker-bake.hcl b/docker-bake.hcl
index b03711e..3b3f4f8 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -66,3 +66,17 @@ target "documentserver-stable" {
         "COMPANY_NAME": "${COMPANY_NAME}"
     }
 }
+
+target "documentserver-nonexample" {
+    tagret = "documentserver-nonexample"
+    dockerfile = Dockerfile.nonExample
+    tags = [ "docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PREFIX_NAME}${PRODUCT_EDITION}:${TAG}",
+             "docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PREFIX_NAME}${PRODUCT_EDITION}:latest"]
+    platforms = ["linux/amd64", "linux/arm64"]
+    args = {
+        "PRODUCT_NAME": "${PRODUCT_NAME}"
+        "COMPANY_NAME": "${COMPANY_NAME}"
+        "PRODUCT_EDITION": "${PRODUCT_EDITION}"
+        "TAG": "${TAG}"
+    } 
+}