diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml
index a9f43de..f4ecfc5 100644
--- a/.github/workflows/stable-build.yml
+++ b/.github/workflows/stable-build.yml
@@ -103,7 +103,6 @@ jobs:
            PRODUCT_EDITION=${{ matrix.edition }} \
            PRODUCT_NAME=${{ env.PRODUCT_NAME }} \
            COMPANY_NAME=${{ env.COMPANY_NAME }} \
-           PREFIX_NAME=-non.example \
            TAG=$TAG \
            docker buildx bake \
            -f docker-bake.hcl ${{ matrix.images }} \
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 160abb1..6be7c4b 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -70,8 +70,7 @@ target "documentserver-stable" {
 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"]
+    tags = [ "docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PREFIX_NAME}${PRODUCT_EDITION}:${SHORTER_TAG}"-nonexample ]
     platforms = ["linux/amd64", "linux/arm64"]
     args = {
         "PRODUCT_NAME": "${PRODUCT_NAME}"