diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile
index 1425aab33..dddda94d4 100644
--- a/aspnet-runtime-6.0/Dockerfile
+++ b/aspnet-runtime-6.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
+#!BuildTag: bci/dotnet-aspnet:6.0.35-%RELEASE%
+#!BuildTag: bci/dotnet-aspnet:6.0.35
 #!BuildTag: bci/dotnet-aspnet:6.0-%RELEASE%
 #!BuildTag: bci/dotnet-aspnet:6.0
-#!BuildTag: bci/dotnet-aspnet:6.0.35
 #!BuildName: bci-dotnet-aspnet-6.0
 #!BuildVersion: 15.6.6.0
 #!BuildRelease: 32
@@ -35,8 +36,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="6.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-aspnet:6.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="6.0.35-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-aspnet:6.0.35-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2024-11-12"
diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile
index b88d5c71a..12d7b3ba1 100644
--- a/aspnet-runtime-8.0/Dockerfile
+++ b/aspnet-runtime-8.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
+#!BuildTag: bci/dotnet-aspnet:8.0.10-%RELEASE%
+#!BuildTag: bci/dotnet-aspnet:8.0.10
 #!BuildTag: bci/dotnet-aspnet:8.0-%RELEASE%
 #!BuildTag: bci/dotnet-aspnet:8.0
-#!BuildTag: bci/dotnet-aspnet:8.0.10
 #!BuildTag: bci/dotnet-aspnet:latest
 #!BuildName: bci-dotnet-aspnet-8.0
 #!BuildVersion: 15.6.8.0
@@ -36,8 +37,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="8.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-aspnet:8.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="8.0.10-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-aspnet:8.0.10-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2026-11-10"
diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile
index 577879143..8b4cc5adb 100644
--- a/dotnet-6.0/Dockerfile
+++ b/dotnet-6.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
+#!BuildTag: bci/dotnet-sdk:6.0.35-%RELEASE%
+#!BuildTag: bci/dotnet-sdk:6.0.35
 #!BuildTag: bci/dotnet-sdk:6.0-%RELEASE%
 #!BuildTag: bci/dotnet-sdk:6.0
-#!BuildTag: bci/dotnet-sdk:6.0.35
 #!BuildName: bci-dotnet-sdk-6.0
 #!BuildVersion: 15.6.6.0
 #!BuildRelease: 32
@@ -35,8 +36,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="6.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-sdk:6.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="6.0.35-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-sdk:6.0.35-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2024-11-12"
diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile
index 1b3a71ced..9ae4c9d5d 100644
--- a/dotnet-8.0/Dockerfile
+++ b/dotnet-8.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
+#!BuildTag: bci/dotnet-sdk:8.0.10-%RELEASE%
+#!BuildTag: bci/dotnet-sdk:8.0.10
 #!BuildTag: bci/dotnet-sdk:8.0-%RELEASE%
 #!BuildTag: bci/dotnet-sdk:8.0
-#!BuildTag: bci/dotnet-sdk:8.0.10
 #!BuildTag: bci/dotnet-sdk:latest
 #!BuildName: bci-dotnet-sdk-8.0
 #!BuildVersion: 15.6.8.0
@@ -36,8 +37,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="8.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-sdk:8.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="8.0.10-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-sdk:8.0.10-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2026-11-10"
@@ -71,8 +72,8 @@ COPY dotnet-apphost-pack-8.0-8.0.10-1.x86_64.rpm /tmp/
 COPY aspnetcore-targeting-pack-8.0-8.0.10-1.x86_64.rpm /tmp/
 #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-8.0-8.0.10-1.x86_64.rpm
 COPY aspnetcore-runtime-8.0-8.0.10-1.x86_64.rpm /tmp/
-#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-sdk-8.0-8.0.402-1.x86_64.rpm
-COPY dotnet-sdk-8.0-8.0.402-1.x86_64.rpm /tmp/
+#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-sdk-8.0-8.0.403-1.x86_64.rpm
+COPY dotnet-sdk-8.0-8.0.403-1.x86_64.rpm /tmp/
 
 
 # Workaround for https://github.com/openSUSE/obs-build/issues/487
diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile
index 8f3d7a0fb..0083eea55 100644
--- a/dotnet-runtime-6.0/Dockerfile
+++ b/dotnet-runtime-6.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
+#!BuildTag: bci/dotnet-runtime:6.0.35-%RELEASE%
+#!BuildTag: bci/dotnet-runtime:6.0.35
 #!BuildTag: bci/dotnet-runtime:6.0-%RELEASE%
 #!BuildTag: bci/dotnet-runtime:6.0
-#!BuildTag: bci/dotnet-runtime:6.0.35
 #!BuildName: bci-dotnet-runtime-6.0
 #!BuildVersion: 15.6.6.0
 #!BuildRelease: 32
@@ -35,8 +36,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="6.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-runtime:6.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="6.0.35-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-runtime:6.0.35-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2024-11-12"
diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile
index edcad044a..8242ac3db 100644
--- a/dotnet-runtime-8.0/Dockerfile
+++ b/dotnet-runtime-8.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
+#!BuildTag: bci/dotnet-runtime:8.0.10-%RELEASE%
+#!BuildTag: bci/dotnet-runtime:8.0.10
 #!BuildTag: bci/dotnet-runtime:8.0-%RELEASE%
 #!BuildTag: bci/dotnet-runtime:8.0
-#!BuildTag: bci/dotnet-runtime:8.0.10
 #!BuildTag: bci/dotnet-runtime:latest
 #!BuildName: bci-dotnet-runtime-8.0
 #!BuildVersion: 15.6.8.0
@@ -36,8 +37,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="8.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-runtime:8.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="8.0.10-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-runtime:8.0.10-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2026-11-10"
diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
index 320f68df5..e8bc54b53 100644
--- a/gcc-13-image/Dockerfile
+++ b/gcc-13-image/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/gcc:%%gcc_minor_version%%-%RELEASE%
+#!BuildTag: bci/gcc:%%gcc_minor_version%%
 #!BuildTag: bci/gcc:13-%RELEASE%
 #!BuildTag: bci/gcc:13
-#!BuildTag: bci/gcc:%%gcc_minor_version%%
 #!BuildTag: bci/gcc:latest
 #!BuildName: bci-gcc-13
 #!BuildVersion: 15.6.13
@@ -38,8 +39,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="13-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/gcc:13-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%gcc_minor_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/gcc:%%gcc_minor_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="sle-bci"
diff --git a/gcc-7-image/Dockerfile b/gcc-7-image/Dockerfile
index 306c54130..18bc105d1 100644
--- a/gcc-7-image/Dockerfile
+++ b/gcc-7-image/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/gcc:%%gcc_minor_version%%-%RELEASE%
+#!BuildTag: bci/gcc:%%gcc_minor_version%%
 #!BuildTag: bci/gcc:7-%RELEASE%
 #!BuildTag: bci/gcc:7
-#!BuildTag: bci/gcc:%%gcc_minor_version%%
 #!BuildName: bci-gcc-7
 #!BuildVersion: 15.6.7
 FROM registry.suse.com/bci/bci-base:15.6
@@ -37,8 +38,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="7-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/gcc:7-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%gcc_minor_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/gcc:%%gcc_minor_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="sle-bci"
diff --git a/git-image/_service b/git-image/_service
index 6a7de1836..d04803163 100644
--- a/git-image/_service
+++ b/git-image/_service
@@ -12,10 +12,4 @@
     <param name="package">git-core</param>
     <param name="parse-version">major</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">git-image.kiwi</param>
-    <param name="regex">%%git_minor_version%%</param>
-    <param name="package">git-core</param>
-    <param name="parse-version">minor</param>
-  </service>
 </services>
\ No newline at end of file
diff --git a/git-image/git-image.kiwi b/git-image/git-image.kiwi
index 3cb768caf..3d7d6d38e 100644
--- a/git-image/git-image.kiwi
+++ b/git-image/git-image.kiwi
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: suse/git:%%git_minor_version%%-%RELEASE% suse/git:%%git_minor_version%% suse/git:%%git_major_version%% suse/git:%%git_version%% suse/git:latest -->
+<!-- OBS-AddTag: suse/git:%%git_version%%-%RELEASE% suse/git:%%git_version%% suse/git:2.43-%RELEASE% suse/git:2.43 suse/git:%%git_major_version%% suse/git:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="git-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -27,8 +27,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker" derived_from="obsrepositories:/bci/bci-micro#15.6">
       <containerconfig
           name="suse/git"
-          tag="%%git_minor_version%%-%RELEASE%"
-          additionaltags="%%git_minor_version%%,%%git_major_version%%,%%git_version%%,latest">
+          tag="%%git_version%%-%RELEASE%"
+          additionaltags="%%git_version%%,2.43-%RELEASE%,2.43,%%git_major_version%%,latest">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.application.git">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>
@@ -39,8 +39,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
             <label name="org.opencontainers.image.vendor" value="SUSE LLC"/>
             <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.suse.com/products/base-container-images/"/>
-            <label name="org.opencontainers.image.ref.name" value="%%git_minor_version%%-%RELEASE%"/>
-            <label name="org.opensuse.reference" value="registry.suse.com/suse/git:%%git_minor_version%%-%RELEASE%"/>
+            <label name="org.opencontainers.image.ref.name" value="%%git_version%%-%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.suse.com/suse/git:%%git_version%%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
             <label name="com.suse.supportlevel" value="l3"/>
             <label name="com.suse.eula" value="sle-eula"/>
diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
index 76ef22932..d88824b10 100644
--- a/golang-oldstable-image/Dockerfile
+++ b/golang-oldstable-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: bci/golang:oldstable-2.%RELEASE%
 #!BuildTag: bci/golang:oldstable
+#!BuildTag: bci/golang:%%golang_version%%-2.%RELEASE%
+#!BuildTag: bci/golang:%%golang_version%%
 #!BuildTag: bci/golang:1.22-2.%RELEASE%
 #!BuildTag: bci/golang:1.22
-#!BuildTag: bci/golang:%%golang_version%%
 #!BuildName: bci-golang-oldstable
 #!BuildVersion: 15.6.1.22.2
 #!BuildRelease: 33
@@ -40,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.22-2.%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/golang:1.22-2.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%golang_version%%-2.%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/golang:%%golang_version%%-2.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"
diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
index a0740e065..1df3b78fa 100644
--- a/golang-oldstable-openssl-image/Dockerfile
+++ b/golang-oldstable-openssl-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: bci/golang:oldstable-openssl-%RELEASE%
 #!BuildTag: bci/golang:oldstable-openssl
+#!BuildTag: bci/golang:%%golang_version%%-openssl-%RELEASE%
+#!BuildTag: bci/golang:%%golang_version%%-openssl
 #!BuildTag: bci/golang:1.20-openssl-%RELEASE%
 #!BuildTag: bci/golang:1.20-openssl
-#!BuildTag: bci/golang:%%golang_version%%
 #!BuildName: bci-golang-oldstable-openssl
 #!BuildVersion: 15.6
 #!BuildRelease: 33
@@ -35,13 +36,13 @@ RUN set -euo pipefail; \
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI Go 1.20-openssl development"
 LABEL org.opencontainers.image.description="Go 1.20-openssl development container based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="%%golang_version%%"
+LABEL org.opencontainers.image.version="%%golang_version%%-openssl"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.20-openssl-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/golang:1.20-openssl-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%golang_version%%-openssl-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/golang:%%golang_version%%-openssl-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"
diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
index 8e339720c..af1bbb001 100644
--- a/golang-stable-image/Dockerfile
+++ b/golang-stable-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: bci/golang:stable-1.%RELEASE%
 #!BuildTag: bci/golang:stable
+#!BuildTag: bci/golang:%%golang_version%%-1.%RELEASE%
+#!BuildTag: bci/golang:%%golang_version%%
 #!BuildTag: bci/golang:1.23-1.%RELEASE%
 #!BuildTag: bci/golang:1.23
-#!BuildTag: bci/golang:%%golang_version%%
 #!BuildTag: bci/golang:latest
 #!BuildName: bci-golang-stable
 #!BuildVersion: 15.6.1.23.1
@@ -41,8 +42,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.23-1.%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/golang:1.23-1.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%golang_version%%-1.%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/golang:%%golang_version%%-1.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"
diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
index 8b91477c7..f5bc2f825 100644
--- a/golang-stable-openssl-image/Dockerfile
+++ b/golang-stable-openssl-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: bci/golang:stable-openssl-%RELEASE%
 #!BuildTag: bci/golang:stable-openssl
+#!BuildTag: bci/golang:%%golang_version%%-openssl-%RELEASE%
+#!BuildTag: bci/golang:%%golang_version%%-openssl
 #!BuildTag: bci/golang:1.21-openssl-%RELEASE%
 #!BuildTag: bci/golang:1.21-openssl
-#!BuildTag: bci/golang:%%golang_version%%
 #!BuildTag: bci/golang:latest
 #!BuildName: bci-golang-stable-openssl
 #!BuildVersion: 15.6
@@ -36,13 +37,13 @@ RUN set -euo pipefail; \
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI Go 1.21-openssl development"
 LABEL org.opencontainers.image.description="Go 1.21-openssl development container based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="%%golang_version%%"
+LABEL org.opencontainers.image.version="%%golang_version%%-openssl"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.21-openssl-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/golang:1.21-openssl-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%golang_version%%-openssl-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/golang:%%golang_version%%-openssl-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"
diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
index 15b07ccda..428932443 100644
--- a/kiwi-image/Dockerfile
+++ b/kiwi-image/Dockerfile
@@ -15,10 +15,11 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/kiwi:9.24.43-%RELEASE%
+#!BuildTag: bci/kiwi:9.24.43
 #!BuildTag: bci/kiwi:9-%RELEASE%
 #!BuildTag: bci/kiwi:9
 #!BuildTag: bci/kiwi:9.24
-#!BuildTag: bci/kiwi:9.24.43
 #!BuildTag: bci/kiwi:latest
 #!BuildName: bci-kiwi-9
 #!BuildVersion: 15.6.9
@@ -40,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="9-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/kiwi:9-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="9.24.43-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/kiwi:9.24.43-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="sle-bci"
diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile
index 6c34cda3a..6ad119436 100644
--- a/nodejs-20-image/Dockerfile
+++ b/nodejs-20-image/Dockerfile
@@ -15,13 +15,15 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/nodejs:%%nodejs_version%%-%RELEASE%
+#!BuildTag: bci/nodejs:%%nodejs_version%%
 #!BuildTag: bci/nodejs:20-%RELEASE%
 #!BuildTag: bci/nodejs:20
-#!BuildTag: bci/nodejs:%%nodejs_version%%
 #!BuildTag: bci/nodejs:latest
+#!BuildTag: bci/node:%%nodejs_version%%-%RELEASE%
+#!BuildTag: bci/node:%%nodejs_version%%
 #!BuildTag: bci/node:20-%RELEASE%
 #!BuildTag: bci/node:20
-#!BuildTag: bci/node:%%nodejs_version%%
 #!BuildTag: bci/node:latest
 #!BuildName: bci-nodejs-20
 #!BuildVersion: 15.6.20
@@ -43,8 +45,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="20-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/nodejs:20-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%nodejs_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/nodejs:%%nodejs_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.supportlevel.until="2026-04-30"
diff --git a/openjdk-21-devel-image/Dockerfile b/openjdk-21-devel-image/Dockerfile
index 5df821e6d..5bce9f5d1 100644
--- a/openjdk-21-devel-image/Dockerfile
+++ b/openjdk-21-devel-image/Dockerfile
@@ -15,6 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
+#!BuildTag: bci/openjdk-devel:%%java_version%%-%RELEASE%
+#!BuildTag: bci/openjdk-devel:%%java_version%%
 #!BuildTag: bci/openjdk-devel:21-%RELEASE%
 #!BuildTag: bci/openjdk-devel:21
 #!BuildTag: bci/openjdk-devel:latest
@@ -37,8 +39,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="21-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/openjdk-devel:21-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%java_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/openjdk-devel:%%java_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"
diff --git a/openjdk-21-image/Dockerfile b/openjdk-21-image/Dockerfile
index f55fe8e74..3e9924861 100644
--- a/openjdk-21-image/Dockerfile
+++ b/openjdk-21-image/Dockerfile
@@ -15,6 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
+#!BuildTag: bci/openjdk:%%java_version%%-%RELEASE%
+#!BuildTag: bci/openjdk:%%java_version%%
 #!BuildTag: bci/openjdk:21-%RELEASE%
 #!BuildTag: bci/openjdk:21
 #!BuildTag: bci/openjdk:latest
@@ -37,8 +39,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="21-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/openjdk:21-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%java_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/openjdk:%%java_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"
diff --git a/php-apache8-image/Dockerfile b/php-apache8-image/Dockerfile
index 41166a59e..33626775c 100644
--- a/php-apache8-image/Dockerfile
+++ b/php-apache8-image/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/php-apache:%%php_version%%-%RELEASE%
+#!BuildTag: bci/php-apache:%%php_version%%
 #!BuildTag: bci/php-apache:8-%RELEASE%
 #!BuildTag: bci/php-apache:8
-#!BuildTag: bci/php-apache:%%php_version%%
 #!BuildTag: bci/php-apache:latest
 #!BuildName: bci-php-apache-8
 #!BuildVersion: 15.6.8
@@ -39,8 +40,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="8-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/php-apache:8-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%php_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/php-apache:%%php_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"
diff --git a/php-apache8-image/README.md b/php-apache8-image/README.md
index ffa09910a..04dc6b7ac 100644
--- a/php-apache8-image/README.md
+++ b/php-apache8-image/README.md
@@ -36,7 +36,7 @@ Alternatively, you can mount the application's source code directly into the
 container:
 
 ```ShellSession
-$ podman run -d -p 8080:80 -v ./app/:/srv/www/htdocs:Z registry.suse.com/bci/php-apache:8-%RELEASE%
+$ podman run -d -p 8080:80 -v ./app/:/srv/www/htdocs:Z registry.suse.com/bci/php-apache:8
 ```
 
 ## How to install PHP extensions
diff --git a/php-fpm8-image/Dockerfile b/php-fpm8-image/Dockerfile
index e0dd8e120..6075a632a 100644
--- a/php-fpm8-image/Dockerfile
+++ b/php-fpm8-image/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/php-fpm:%%php_version%%-%RELEASE%
+#!BuildTag: bci/php-fpm:%%php_version%%
 #!BuildTag: bci/php-fpm:8-%RELEASE%
 #!BuildTag: bci/php-fpm:8
-#!BuildTag: bci/php-fpm:%%php_version%%
 #!BuildTag: bci/php-fpm:latest
 #!BuildName: bci-php-fpm-8
 #!BuildVersion: 15.6.8
@@ -39,8 +40,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="8-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/php-fpm:8-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%php_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/php-fpm:%%php_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"
diff --git a/php8-image/Dockerfile b/php8-image/Dockerfile
index 61a016c7c..a7b9750a2 100644
--- a/php8-image/Dockerfile
+++ b/php8-image/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/php:%%php_version%%-%RELEASE%
+#!BuildTag: bci/php:%%php_version%%
 #!BuildTag: bci/php:8-%RELEASE%
 #!BuildTag: bci/php:8
-#!BuildTag: bci/php:%%php_version%%
 #!BuildTag: bci/php:latest
 #!BuildName: bci-php-8
 #!BuildVersion: 15.6.8
@@ -39,8 +40,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="8-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/php:8-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%php_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/php:%%php_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"
diff --git a/postgres-16-image/Dockerfile b/postgres-16-image/Dockerfile
index 66989c8d3..df703e5f8 100644
--- a/postgres-16-image/Dockerfile
+++ b/postgres-16-image/Dockerfile
@@ -15,10 +15,11 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: suse/postgres:%%pg_patch_version%%-%RELEASE%
+#!BuildTag: suse/postgres:%%pg_patch_version%%
 #!BuildTag: suse/postgres:16-%RELEASE%
 #!BuildTag: suse/postgres:16
 #!BuildTag: suse/postgres:%%pg_minor_version%%
-#!BuildTag: suse/postgres:%%pg_patch_version%%
 #!BuildTag: suse/postgres:latest
 #!BuildName: suse-postgres-16
 #!BuildVersion: 15.6.16
@@ -40,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="16-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/suse/postgres:16-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%pg_patch_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/suse/postgres:%%pg_patch_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="acc"
 LABEL com.suse.eula="sle-eula"
diff --git a/python-3.11-image/Dockerfile b/python-3.11-image/Dockerfile
index 5b68e73f0..0c45df574 100644
--- a/python-3.11-image/Dockerfile
+++ b/python-3.11-image/Dockerfile
@@ -15,10 +15,11 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/python:%%py311_ver%%-%RELEASE%
+#!BuildTag: bci/python:%%py311_ver%%
 #!BuildTag: bci/python:3.11-%RELEASE%
 #!BuildTag: bci/python:3.11
 #!BuildTag: bci/python:3
-#!BuildTag: bci/python:%%py311_ver%%
 #!BuildName: bci-python-3.11
 #!BuildVersion: 15.6.3.11
 #!BuildRelease: 41
@@ -39,8 +40,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="3.11-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/python:3.11-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%py311_ver%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/python:%%py311_ver%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.supportlevel.until="2027-12-31"
diff --git a/python-3.12-image/Dockerfile b/python-3.12-image/Dockerfile
index 92a2506fd..217177c58 100644
--- a/python-3.12-image/Dockerfile
+++ b/python-3.12-image/Dockerfile
@@ -15,10 +15,11 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/python:%%py312_ver%%-%RELEASE%
+#!BuildTag: bci/python:%%py312_ver%%
 #!BuildTag: bci/python:3.12-%RELEASE%
 #!BuildTag: bci/python:3.12
 #!BuildTag: bci/python:3
-#!BuildTag: bci/python:%%py312_ver%%
 #!BuildTag: bci/python:latest
 #!BuildName: bci-python-3.12
 #!BuildVersion: 15.6.3.12
@@ -40,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="3.12-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/python:3.12-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%py312_ver%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/python:%%py312_ver%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"
diff --git a/python-3.6-image/Dockerfile b/python-3.6-image/Dockerfile
index 2c3319258..f6868a239 100644
--- a/python-3.6-image/Dockerfile
+++ b/python-3.6-image/Dockerfile
@@ -15,10 +15,11 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/python:%%py36_ver%%-%RELEASE%
+#!BuildTag: bci/python:%%py36_ver%%
 #!BuildTag: bci/python:3.6-%RELEASE%
 #!BuildTag: bci/python:3.6
 #!BuildTag: bci/python:3
-#!BuildTag: bci/python:%%py36_ver%%
 #!BuildName: bci-python-3.6
 #!BuildVersion: 15.6.3.6
 #!BuildRelease: 41
@@ -39,8 +40,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="3.6-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/python:3.6-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%py36_ver%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/python:%%py36_ver%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.supportlevel.until="2031-07-31"
diff --git a/rmt-mariadb-client-image/Dockerfile b/rmt-mariadb-client-image/Dockerfile
index 5aa785c2e..fb8ae33cc 100644
--- a/rmt-mariadb-client-image/Dockerfile
+++ b/rmt-mariadb-client-image/Dockerfile
@@ -15,9 +15,13 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: suse/rmt-mariadb-client:%%mariadb_version%%-%RELEASE%
+#!BuildTag: suse/rmt-mariadb-client:%%mariadb_version%%
 #!BuildTag: suse/rmt-mariadb-client:10.11-%RELEASE%
 #!BuildTag: suse/rmt-mariadb-client:10.11
 #!BuildTag: suse/rmt-mariadb-client:latest
+#!BuildTag: suse/mariadb-client:%%mariadb_version%%-%RELEASE%
+#!BuildTag: suse/mariadb-client:%%mariadb_version%%
 #!BuildTag: suse/mariadb-client:10.11-%RELEASE%
 #!BuildTag: suse/mariadb-client:10.11
 #!BuildTag: suse/mariadb-client:latest
@@ -41,8 +45,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="10.11-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/suse/rmt-mariadb-client:10.11-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%mariadb_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/suse/rmt-mariadb-client:%%mariadb_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-eula"
diff --git a/rmt-mariadb-image/Dockerfile b/rmt-mariadb-image/Dockerfile
index a2ffca4e7..343858d0f 100644
--- a/rmt-mariadb-image/Dockerfile
+++ b/rmt-mariadb-image/Dockerfile
@@ -15,9 +15,13 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: suse/rmt-mariadb:%%mariadb_version%%-%RELEASE%
+#!BuildTag: suse/rmt-mariadb:%%mariadb_version%%
 #!BuildTag: suse/rmt-mariadb:10.11-%RELEASE%
 #!BuildTag: suse/rmt-mariadb:10.11
 #!BuildTag: suse/rmt-mariadb:latest
+#!BuildTag: suse/mariadb:%%mariadb_version%%-%RELEASE%
+#!BuildTag: suse/mariadb:%%mariadb_version%%
 #!BuildTag: suse/mariadb:10.11-%RELEASE%
 #!BuildTag: suse/mariadb:10.11
 #!BuildTag: suse/mariadb:latest
@@ -41,8 +45,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="10.11-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/suse/rmt-mariadb:10.11-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%mariadb_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/suse/rmt-mariadb:%%mariadb_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-eula"
diff --git a/rmt-server-image/Dockerfile b/rmt-server-image/Dockerfile
index 7e8732f2d..646469c08 100644
--- a/rmt-server-image/Dockerfile
+++ b/rmt-server-image/Dockerfile
@@ -18,7 +18,7 @@
 #!BuildTag: suse/rmt-server:%%rmt_version%%-%RELEASE%
 #!BuildTag: suse/rmt-server:%%rmt_version%%
 #!BuildTag: suse/rmt-server:latest
-#!BuildName: suse-rmt-server
+#!BuildName: suse-rmt-server-%%rmt_version%%
 #!BuildVersion: 15.6
 #!BuildRelease: 35
 FROM registry.suse.com/bci/bci-base:15.6
diff --git a/rust-oldstable-image/Dockerfile b/rust-oldstable-image/Dockerfile
index 44fd1e31a..3bcb6b20c 100644
--- a/rust-oldstable-image/Dockerfile
+++ b/rust-oldstable-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: bci/rust:oldstable-2.%RELEASE%
 #!BuildTag: bci/rust:oldstable
+#!BuildTag: bci/rust:%%RUST_VERSION%%-2.%RELEASE%
+#!BuildTag: bci/rust:%%RUST_VERSION%%
 #!BuildTag: bci/rust:1.80-2.%RELEASE%
 #!BuildTag: bci/rust:1.80
-#!BuildTag: bci/rust:%%RUST_VERSION%%
 #!BuildName: bci-rust-oldstable
 #!BuildVersion: 15.6.1.80.2
 FROM registry.suse.com/bci/bci-base:15.6
@@ -39,8 +40,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.80-2.%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.80-2.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%RUST_VERSION%%-2.%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/rust:%%RUST_VERSION%%-2.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.supportlevel.until="2024-11-07"
diff --git a/rust-stable-image/Dockerfile b/rust-stable-image/Dockerfile
index 3cd5a36de..721864e39 100644
--- a/rust-stable-image/Dockerfile
+++ b/rust-stable-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: bci/rust:stable-1.%RELEASE%
 #!BuildTag: bci/rust:stable
+#!BuildTag: bci/rust:%%RUST_VERSION%%-1.%RELEASE%
+#!BuildTag: bci/rust:%%RUST_VERSION%%
 #!BuildTag: bci/rust:1.81-1.%RELEASE%
 #!BuildTag: bci/rust:1.81
-#!BuildTag: bci/rust:%%RUST_VERSION%%
 #!BuildTag: bci/rust:latest
 #!BuildName: bci-rust-stable
 #!BuildVersion: 15.6.1.81.1
@@ -40,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.81-1.%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/rust:1.81-1.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%RUST_VERSION%%-1.%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/rust:%%RUST_VERSION%%-1.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.supportlevel.until="2024-12-19"
diff --git a/sac-apache-tomcat-10-image/Dockerfile.openjdk17 b/sac-apache-tomcat-10-image/Dockerfile.openjdk17
index 469d2ca33..90fd70369 100644
--- a/sac-apache-tomcat-10-image/Dockerfile.openjdk17
+++ b/sac-apache-tomcat-10-image/Dockerfile.openjdk17
@@ -15,12 +15,13 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64
+#!BuildTag: containers/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE%
+#!BuildTag: containers/apache-tomcat:%%tomcat_version%%-openjdk17
 #!BuildTag: containers/apache-tomcat:10.1-openjdk17-%RELEASE%
 #!BuildTag: containers/apache-tomcat:10.1-openjdk17
-#!BuildTag: containers/apache-tomcat:%%tomcat_version%%-openjdk17
 #!ForceMultiVersion
 #!BuildName: containers-apache-tomcat-10.1-openjdk17
-#!BuildVersion: 15.6
+#!BuildVersion: %%tomcat_version%%
 #!BuildRelease: 55
 FROM registry.suse.com/bci/bci-micro:15.6 AS target
 FROM bci/bci-base:15.6 AS builder
@@ -42,8 +43,8 @@ LABEL org.opencontainers.image.url="https://apps.rancher.io/applications/apache-
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="10.1-openjdk17-%RELEASE%"
-LABEL org.opensuse.reference="dp.apps.rancher.io/containers/apache-tomcat:10.1-openjdk17-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk17-%RELEASE%"
+LABEL org.opensuse.reference="dp.apps.rancher.io/containers/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2027-07-01"
diff --git a/sac-apache-tomcat-10-image/Dockerfile.openjdk21 b/sac-apache-tomcat-10-image/Dockerfile.openjdk21
index f1ed5dd69..0a3d1562c 100644
--- a/sac-apache-tomcat-10-image/Dockerfile.openjdk21
+++ b/sac-apache-tomcat-10-image/Dockerfile.openjdk21
@@ -15,12 +15,13 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64
+#!BuildTag: containers/apache-tomcat:%%tomcat_version%%-openjdk21-%RELEASE%
+#!BuildTag: containers/apache-tomcat:%%tomcat_version%%-openjdk21
 #!BuildTag: containers/apache-tomcat:10.1-openjdk21-%RELEASE%
 #!BuildTag: containers/apache-tomcat:10.1-openjdk21
-#!BuildTag: containers/apache-tomcat:%%tomcat_version%%-openjdk21
 #!ForceMultiVersion
 #!BuildName: containers-apache-tomcat-10.1-openjdk21
-#!BuildVersion: 15.6
+#!BuildVersion: %%tomcat_version%%
 #!BuildRelease: 55
 FROM registry.suse.com/bci/bci-micro:15.6 AS target
 FROM bci/bci-base:15.6 AS builder
@@ -42,8 +43,8 @@ LABEL org.opencontainers.image.url="https://apps.rancher.io/applications/apache-
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="10.1-openjdk21-%RELEASE%"
-LABEL org.opensuse.reference="dp.apps.rancher.io/containers/apache-tomcat:10.1-openjdk21-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk21-%RELEASE%"
+LABEL org.opensuse.reference="dp.apps.rancher.io/containers/apache-tomcat:%%tomcat_version%%-openjdk21-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2027-07-01"
diff --git a/sac-postfix-image/Dockerfile b/sac-postfix-image/Dockerfile
index cc43d6476..7c728e406 100644
--- a/sac-postfix-image/Dockerfile
+++ b/sac-postfix-image/Dockerfile
@@ -19,7 +19,7 @@
 #!BuildTag: containers/postfix:%%postfix_version%%
 #!ForceMultiVersion
 #!BuildName: containers-postfix-%%postfix_version%%
-#!BuildVersion: 15.6
+#!BuildVersion: %%postfix_version%%
 #!BuildRelease: 35
 FROM registry.suse.com/bci/bci-micro:15.6 AS target
 FROM bci/bci-base:15.6 AS builder
diff --git a/sac-python-3.9-image/Dockerfile b/sac-python-3.9-image/Dockerfile
index ed23fcb3d..e4d2839c3 100644
--- a/sac-python-3.9-image/Dockerfile
+++ b/sac-python-3.9-image/Dockerfile
@@ -15,13 +15,14 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64
+#!BuildTag: containers/python:%%py39_ver%%-%RELEASE%
+#!BuildTag: containers/python:%%py39_ver%%
 #!BuildTag: containers/python:3.9-%RELEASE%
 #!BuildTag: containers/python:3.9
 #!BuildTag: containers/python:3
-#!BuildTag: containers/python:%%py39_ver%%
 #!ForceMultiVersion
 #!BuildName: containers-python-3.9
-#!BuildVersion: 15.6.3.9
+#!BuildVersion: %%py39_ver%%
 #!BuildRelease: 41
 FROM registry.suse.com/bci/bci-base:15.6
 
@@ -39,8 +40,8 @@ LABEL org.opencontainers.image.url="https://apps.rancher.io/applications/python"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="3.9-%RELEASE%"
-LABEL org.opensuse.reference="dp.apps.rancher.io/containers/python:3.9-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%py39_ver%%-%RELEASE%"
+LABEL org.opensuse.reference="dp.apps.rancher.io/containers/python:%%py39_ver%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.supportlevel.until="2027-12-31 00:00:00"
diff --git a/spack-image/Dockerfile b/spack-image/Dockerfile
index aee158a28..3d70b495b 100644
--- a/spack-image/Dockerfile
+++ b/spack-image/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64
+#!BuildTag: bci/spack:0.21.2-%RELEASE%
+#!BuildTag: bci/spack:0.21.2
 #!BuildTag: bci/spack:0.21-%RELEASE%
 #!BuildTag: bci/spack:0.21
-#!BuildTag: bci/spack:0.21.2
 #!BuildTag: bci/spack:latest
 #!BuildName: bci-spack-0.21
 #!BuildVersion: 15.6.0.21
@@ -38,8 +39,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="0.21-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/spack:0.21-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="0.21.2-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/spack:0.21.2-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"