diff --git a/base-image/base-image.changes b/base-image/base-image.changes
index 81ace62cd..4c0bf822d 100644
--- a/base-image/base-image.changes
+++ b/base-image/base-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:21 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Fri Oct 11 14:59:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/base-image/base-image.kiwi b/base-image/base-image.kiwi
index 066d2ca1d..8a26cc992 100644
--- a/base-image/base-image.kiwi
+++ b/base-image/base-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: bci/bci-base:%OS_VERSION_ID_SP% bci/bci-base:%OS_VERSION_ID_SP%-%RELEASE% -->
+<!-- OBS-AddTag: bci/bci-base:%OS_VERSION_ID_SP%-%RELEASE% bci/bci-base:%OS_VERSION_ID_SP% -->
 <!-- OBS-ExclusiveArch: aarch64 x86_64 ppc64le s390x -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
@@ -28,8 +28,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker">
       <containerconfig
           name="bci/bci-base"
-          tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%-%RELEASE%">
+          tag="%OS_VERSION_ID_SP%-%RELEASE%"
+          additionaltags="%OS_VERSION_ID_SP%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.base">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>
diff --git a/busybox-image/busybox-image.changes b/busybox-image/busybox-image.changes
index c4c0cdfc4..9016d5cb6 100644
--- a/busybox-image/busybox-image.changes
+++ b/busybox-image/busybox-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:21 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Fri Oct 11 14:59:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/busybox-image/busybox-image.kiwi b/busybox-image/busybox-image.kiwi
index 9073f85a8..156779129 100644
--- a/busybox-image/busybox-image.kiwi
+++ b/busybox-image/busybox-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: bci/bci-busybox:%OS_VERSION_ID_SP% bci/bci-busybox:%OS_VERSION_ID_SP%-%RELEASE% -->
+<!-- OBS-AddTag: bci/bci-busybox:%OS_VERSION_ID_SP%-%RELEASE% bci/bci-busybox:%OS_VERSION_ID_SP% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="busybox-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">
       <containerconfig
           name="bci/bci-busybox"
-          tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%-%RELEASE%">
+          tag="%OS_VERSION_ID_SP%-%RELEASE%"
+          additionaltags="%OS_VERSION_ID_SP%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.busybox">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>
diff --git a/init-image/Dockerfile b/init-image/Dockerfile
index 534cc226c..ac0eec5cf 100644
--- a/init-image/Dockerfile
+++ b/init-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%
 #!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%-%RELEASE%
+#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%
 
 FROM bci/bci-base:16.0
 
diff --git a/init-image/init-image.changes b/init-image/init-image.changes
index 56c878c6e..21a28db73 100644
--- a/init-image/init-image.changes
+++ b/init-image/init-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:21 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Fri Oct 11 14:59:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
index 45bc0a46e..e7ad937d1 100644
--- a/kiwi-image/Dockerfile
+++ b/kiwi-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/kiwi:10
 #!BuildTag: bci/kiwi:10-%RELEASE%
+#!BuildTag: bci/kiwi:10
 #!BuildTag: bci/kiwi:10.1
 #!BuildTag: bci/kiwi:10.1.10
 
diff --git a/kiwi-image/kiwi-image.changes b/kiwi-image/kiwi-image.changes
index b3856ebc8..7342c7e3d 100644
--- a/kiwi-image/kiwi-image.changes
+++ b/kiwi-image/kiwi-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:21 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Tue Oct  1 10:41:01 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/micro-image/micro-image.changes b/micro-image/micro-image.changes
index 651340a6f..5ba4257a2 100644
--- a/micro-image/micro-image.changes
+++ b/micro-image/micro-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:21 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Fri Oct 11 14:59:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/micro-image/micro-image.kiwi b/micro-image/micro-image.kiwi
index ad50c0daf..497e97093 100644
--- a/micro-image/micro-image.kiwi
+++ b/micro-image/micro-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: bci/bci-micro:%OS_VERSION_ID_SP% bci/bci-micro:%OS_VERSION_ID_SP%-%RELEASE% -->
+<!-- OBS-AddTag: bci/bci-micro:%OS_VERSION_ID_SP%-%RELEASE% bci/bci-micro:%OS_VERSION_ID_SP% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="micro-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">
       <containerconfig
           name="bci/bci-micro"
-          tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%-%RELEASE%">
+          tag="%OS_VERSION_ID_SP%-%RELEASE%"
+          additionaltags="%OS_VERSION_ID_SP%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.micro">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>
diff --git a/minimal-image/minimal-image.changes b/minimal-image/minimal-image.changes
index d86e37bcb..9fdc0a79c 100644
--- a/minimal-image/minimal-image.changes
+++ b/minimal-image/minimal-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:21 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Fri Oct 11 14:59:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/minimal-image/minimal-image.kiwi b/minimal-image/minimal-image.kiwi
index 8585add4a..d1422afc2 100644
--- a/minimal-image/minimal-image.kiwi
+++ b/minimal-image/minimal-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: bci/bci-minimal:%OS_VERSION_ID_SP% bci/bci-minimal:%OS_VERSION_ID_SP%-%RELEASE% -->
+<!-- OBS-AddTag: bci/bci-minimal:%OS_VERSION_ID_SP%-%RELEASE% bci/bci-minimal:%OS_VERSION_ID_SP% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="minimal-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#16.0">
       <containerconfig
           name="bci/bci-minimal"
-          tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%-%RELEASE%">
+          tag="%OS_VERSION_ID_SP%-%RELEASE%"
+          additionaltags="%OS_VERSION_ID_SP%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.minimal">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>
diff --git a/sle16-kernel-module-devel-image/Dockerfile b/sle16-kernel-module-devel-image/Dockerfile
index 86661bf95..1fbb7e584 100644
--- a/sle16-kernel-module-devel-image/Dockerfile
+++ b/sle16-kernel-module-devel-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/bci-sle16-kernel-module-devel:%OS_VERSION_ID_SP%
 #!BuildTag: bci/bci-sle16-kernel-module-devel:%OS_VERSION_ID_SP%-%RELEASE%
+#!BuildTag: bci/bci-sle16-kernel-module-devel:%OS_VERSION_ID_SP%
 
 FROM bci/bci-base:16.0
 
diff --git a/sle16-kernel-module-devel-image/sle16-kernel-module-devel-image.changes b/sle16-kernel-module-devel-image/sle16-kernel-module-devel-image.changes
index 73d1b9e96..6b1e065a4 100644
--- a/sle16-kernel-module-devel-image/sle16-kernel-module-devel-image.changes
+++ b/sle16-kernel-module-devel-image/sle16-kernel-module-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:21 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Fri Oct 11 14:59:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>