diff --git a/busybox-image/_service b/busybox-image/_service
index bd1abb02d..0593b7b3f 100644
--- a/busybox-image/_service
+++ b/busybox-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="kiwi_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file
diff --git a/init-image/_service b/init-image/_service
index 053a4f4f8..2bef4c2ab 100644
--- a/init-image/_service
+++ b/init-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file
diff --git a/micro-image/_service b/micro-image/_service
index bd1abb02d..0593b7b3f 100644
--- a/micro-image/_service
+++ b/micro-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="kiwi_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file
diff --git a/minimal-image/_service b/minimal-image/_service
index bd1abb02d..0593b7b3f 100644
--- a/minimal-image/_service
+++ b/minimal-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="kiwi_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file
diff --git a/nodejs-18-image/Dockerfile b/nodejs-18-image/Dockerfile
index 685341266..858b7435a 100644
--- a/nodejs-18-image/Dockerfile
+++ b/nodejs-18-image/Dockerfile
@@ -15,12 +15,14 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/nodejs:%%nodejs_version%%-%RELEASE%
+#!BuildTag: bci/nodejs:%%nodejs_version%%
 #!BuildTag: bci/nodejs:18-%RELEASE%
 #!BuildTag: bci/nodejs:18
-#!BuildTag: bci/nodejs:%%nodejs_version%%
+#!BuildTag: bci/node:%%nodejs_version%%-%RELEASE%
+#!BuildTag: bci/node:%%nodejs_version%%
 #!BuildTag: bci/node:18-%RELEASE%
 #!BuildTag: bci/node:18
-#!BuildTag: bci/node:%%nodejs_version%%
 #!BuildName: bci-nodejs-18
 #!BuildVersion: 15.5.18
 FROM registry.suse.com/bci/bci-base:15.5
@@ -40,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="18-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/nodejs:18-%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="2024-12-31"
diff --git a/nodejs-18-image/_service b/nodejs-18-image/_service
index 794158b56..cc75bdc10 100644
--- a/nodejs-18-image/_service
+++ b/nodejs-18-image/_service
@@ -1,6 +1,6 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%nodejs_version%%</param>
diff --git a/openjdk-11-devel-image/Dockerfile b/openjdk-11-devel-image/Dockerfile
index 8023e52bb..13d172d70 100644
--- a/openjdk-11-devel-image/Dockerfile
+++ b/openjdk-11-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:11-%RELEASE%
 #!BuildTag: bci/openjdk-devel:11
 #!BuildName: bci-openjdk-devel-11
@@ -36,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="11-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/openjdk-devel:11-%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-11-devel-image/_service b/openjdk-11-devel-image/_service
index 65f5a3c7b..f1f962939 100644
--- a/openjdk-11-devel-image/_service
+++ b/openjdk-11-devel-image/_service
@@ -1,6 +1,6 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%java_version%%</param>
diff --git a/openjdk-11-image/Dockerfile b/openjdk-11-image/Dockerfile
index f4d0c7db7..fbced2126 100644
--- a/openjdk-11-image/Dockerfile
+++ b/openjdk-11-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:11-%RELEASE%
 #!BuildTag: bci/openjdk:11
 #!BuildName: bci-openjdk-11
@@ -36,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="11-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/openjdk:11-%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/openjdk-11-image/_service b/openjdk-11-image/_service
index 5296c8efa..799b9b5b1 100644
--- a/openjdk-11-image/_service
+++ b/openjdk-11-image/_service
@@ -1,6 +1,6 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%java_version%%</param>
diff --git a/openjdk-17-devel-image/Dockerfile b/openjdk-17-devel-image/Dockerfile
index 078ee321e..ed93fc4ea 100644
--- a/openjdk-17-devel-image/Dockerfile
+++ b/openjdk-17-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:17-%RELEASE%
 #!BuildTag: bci/openjdk-devel:17
 #!BuildName: bci-openjdk-devel-17
@@ -36,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="17-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/openjdk-devel:17-%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-17-devel-image/_service b/openjdk-17-devel-image/_service
index 7a541a057..06c7d4274 100644
--- a/openjdk-17-devel-image/_service
+++ b/openjdk-17-devel-image/_service
@@ -1,6 +1,6 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%java_version%%</param>
diff --git a/openjdk-17-image/Dockerfile b/openjdk-17-image/Dockerfile
index e744a2574..1c9b2c79e 100644
--- a/openjdk-17-image/Dockerfile
+++ b/openjdk-17-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:17-%RELEASE%
 #!BuildTag: bci/openjdk:17
 #!BuildName: bci-openjdk-17
@@ -36,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="17-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/openjdk:17-%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/openjdk-17-image/_service b/openjdk-17-image/_service
index 59ee664fd..e3e8834c1 100644
--- a/openjdk-17-image/_service
+++ b/openjdk-17-image/_service
@@ -1,6 +1,6 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%java_version%%</param>
diff --git a/postgres-15-image/Dockerfile b/postgres-15-image/Dockerfile
index e6758c939..5f87f906d 100644
--- a/postgres-15-image/Dockerfile
+++ b/postgres-15-image/Dockerfile
@@ -15,10 +15,11 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: suse/postgres:%%pg_patch_version%%-%RELEASE%
+#!BuildTag: suse/postgres:%%pg_patch_version%%
 #!BuildTag: suse/postgres:15-%RELEASE%
 #!BuildTag: suse/postgres:15
 #!BuildTag: suse/postgres:%%pg_minor_version%%
-#!BuildTag: suse/postgres:%%pg_patch_version%%
 #!BuildName: suse-postgres-15
 #!BuildVersion: 15.5.15
 FROM registry.suse.com/bci/bci-base:15.5
@@ -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="15-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/suse/postgres:15-%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/postgres-15-image/_service b/postgres-15-image/_service
index 051d579fc..990fda914 100644
--- a/postgres-15-image/_service
+++ b/postgres-15-image/_service
@@ -1,6 +1,6 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pg_minor_version%%</param>
diff --git a/sle15-kernel-module-devel-image/_service b/sle15-kernel-module-devel-image/_service
index 053a4f4f8..2bef4c2ab 100644
--- a/sle15-kernel-module-devel-image/_service
+++ b/sle15-kernel-module-devel-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file