diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml
index c8fe2fa2937..1fb3f67b592 100644
--- a/.github/workflows/container_maintenance.yml
+++ b/.github/workflows/container_maintenance.yml
@@ -129,7 +129,7 @@ jobs:
         uses: gdcc/wip-dataverse-base-image/.github/actions/get-image-revision@10478-version-base-img
         with:
           image-ref: ${{ env.BASE_IMAGE }}
-          tag-options-prefix: "-Dbase.image.tag=\\\\${base.image.tag.release} -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision="
+          tag-options-prefix: "-Dbase.image.tag.stack-suffix="" -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision="
       - name: Configure update of "latest" tag for development branch
         if: ${{ matrix.branch == env.DEVELOP_BRANCH }}
         run: |
diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml
index e707c6a69c8..9ce9aed92cf 100644
--- a/modules/container-base/pom.xml
+++ b/modules/container-base/pom.xml
@@ -43,8 +43,8 @@
                 <!-- We default to the long version here for the sake of local development. CI will change this for releases. -->
                 <base.image>gdcc/base:${base.image.tag}</base.image>
                 <!-- base.image.version comes from dataverse-parent -->
-                <base.image.tag>${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version}</base.image.tag>
-                <base.image.tag.release>${base.image.version}-${java.image.flavor}</base.image.tag.release>
+                <base.image.tag>${base.image.version}-${java.image.flavor}${base.image.tag.stack-suffix}</base.image.tag>
+                <base.image.tag.stack-suffix>-p${payara.version}-j${target.java.version}</base.image.tag.stack-suffix>
                 <java.image>eclipse-temurin:${target.java.version}-jre-${java.image.flavor}</java.image>
                 <java.image.flavor>noble</java.image.flavor>
                 <base.image.uid>1000</base.image.uid>