diff --git a/389-ds-container/389-ds-container.changes b/389-ds-container/389-ds-container.changes
index 1b1391abf..d7ac1c64c 100644
--- a/389-ds-container/389-ds-container.changes
+++ b/389-ds-container/389-ds-container.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/389-ds-container/_service b/389-ds-container/_service
index bb900220f..2b3a72fe0 100644
--- a/389-ds-container/_service
+++ b/389-ds-container/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%389ds_version%%</param>
     <param name="package">389-ds</param>
diff --git a/alertmanager-image/_service b/alertmanager-image/_service
index ab544ee0f..f1a6cf1d5 100644
--- a/alertmanager-image/_service
+++ b/alertmanager-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%alertmanager_minor_version%%</param>
     <param name="package">golang-github-prometheus-alertmanager</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%alertmanager_patch_version%%</param>
     <param name="package">golang-github-prometheus-alertmanager</param>
diff --git a/alertmanager-image/alertmanager-image.changes b/alertmanager-image/alertmanager-image.changes
index 0dc4f6fe1..afd552028 100644
--- a/alertmanager-image/alertmanager-image.changes
+++ b/alertmanager-image/alertmanager-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/blackbox_exporter-image/_service b/blackbox_exporter-image/_service
index 3f8747bc0..c8e195035 100644
--- a/blackbox_exporter-image/_service
+++ b/blackbox_exporter-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%blackbox_exporter_minor_version%%</param>
     <param name="package">prometheus-blackbox_exporter</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%blackbox_exporter_patch_version%%</param>
     <param name="package">prometheus-blackbox_exporter</param>
diff --git a/blackbox_exporter-image/blackbox_exporter-image.changes b/blackbox_exporter-image/blackbox_exporter-image.changes
index 6f65cac71..373bd66ed 100644
--- a/blackbox_exporter-image/blackbox_exporter-image.changes
+++ b/blackbox_exporter-image/blackbox_exporter-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/cosign-image/_service b/cosign-image/_service
index 9004634c2..b971e9d6a 100644
--- a/cosign-image/_service
+++ b/cosign-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%cosign_version%%</param>
     <param name="package">cosign</param>
diff --git a/cosign-image/cosign-image.changes b/cosign-image/cosign-image.changes
index b8322b120..a5d0cf1a3 100644
--- a/cosign-image/cosign-image.changes
+++ b/cosign-image/cosign-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Mon Nov 25 15:33:48 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/distribution-image/_service b/distribution-image/_service
index 82dd7c1ea..3e65721eb 100644
--- a/distribution-image/_service
+++ b/distribution-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="kiwi_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">distribution-image.kiwi</param>
     <param name="regex">%%registry_version%%</param>
     <param name="package">distribution-registry</param>
diff --git a/distribution-image/distribution-image.changes b/distribution-image/distribution-image.changes
index 2fe0683f6..b0bf77c17 100644
--- a/distribution-image/distribution-image.changes
+++ b/distribution-image/distribution-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/gcc-14-image/_service b/gcc-14-image/_service
index 7a2e8ff99..9d8841edb 100644
--- a/gcc-14-image/_service
+++ b/gcc-14-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%gcc_minor_version%%</param>
     <param name="package">gcc14</param>
diff --git a/gcc-14-image/gcc-14-image.changes b/gcc-14-image/gcc-14-image.changes
index 6d1ccc7fc..16c262eb3 100644
--- a/gcc-14-image/gcc-14-image.changes
+++ b/gcc-14-image/gcc-14-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Fri Nov  8 10:49:12 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/git-image/_service b/git-image/_service
index d04803163..7af8eaa71 100644
--- a/git-image/_service
+++ b/git-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="kiwi_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">git-image.kiwi</param>
     <param name="regex">%%git_version%%</param>
     <param name="package">git-core</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">git-image.kiwi</param>
     <param name="regex">%%git_major_version%%</param>
     <param name="package">git-core</param>
diff --git a/git-image/git-image.changes b/git-image/git-image.changes
index fd1b21106..a6f4ef08f 100644
--- a/git-image/git-image.changes
+++ b/git-image/git-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Thu Nov 28 14:47:58 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/golang-oldstable-image/_service b/golang-oldstable-image/_service
index cce275c72..b643e92a3 100644
--- a/golang-oldstable-image/_service
+++ b/golang-oldstable-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
     <param name="package">go1.22</param>
diff --git a/golang-oldstable-image/golang-oldstable-image.changes b/golang-oldstable-image/golang-oldstable-image.changes
index 4440dfe32..587c625ce 100644
--- a/golang-oldstable-image/golang-oldstable-image.changes
+++ b/golang-oldstable-image/golang-oldstable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/golang-oldstable-openssl-image/_service b/golang-oldstable-openssl-image/_service
index f5e76e3b5..422830d6d 100644
--- a/golang-oldstable-openssl-image/_service
+++ b/golang-oldstable-openssl-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
     <param name="package">go1.22-openssl</param>
diff --git a/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes b/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes
index f72f881fb..708e8525f 100644
--- a/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes
+++ b/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Thu Nov  7 14:16:00 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/golang-stable-image/_service b/golang-stable-image/_service
index d434cc6b4..bfbf44d50 100644
--- a/golang-stable-image/_service
+++ b/golang-stable-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
     <param name="package">go1.23</param>
diff --git a/golang-stable-image/golang-stable-image.changes b/golang-stable-image/golang-stable-image.changes
index 9884c9047..cba9d571f 100644
--- a/golang-stable-image/golang-stable-image.changes
+++ b/golang-stable-image/golang-stable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/golang-stable-openssl-image/_service b/golang-stable-openssl-image/_service
index 116bca1d1..e41ed8514 100644
--- a/golang-stable-openssl-image/_service
+++ b/golang-stable-openssl-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
     <param name="package">go1.23-openssl</param>
diff --git a/golang-stable-openssl-image/golang-stable-openssl-image.changes b/golang-stable-openssl-image/golang-stable-openssl-image.changes
index aa4855c96..25da662ab 100644
--- a/golang-stable-openssl-image/golang-stable-openssl-image.changes
+++ b/golang-stable-openssl-image/golang-stable-openssl-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Thu Nov  7 14:16:00 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/grafana-image/_service b/grafana-image/_service
index 0d6958e93..3b037f222 100644
--- a/grafana-image/_service
+++ b/grafana-image/_service
@@ -1,19 +1,19 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%grafana_major_version%%</param>
     <param name="package">grafana</param>
     <param name="parse-version">major</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%grafana_minor_version%%</param>
     <param name="package">grafana</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%grafana_patch_version%%</param>
     <param name="package">grafana</param>
diff --git a/grafana-image/grafana-image.changes b/grafana-image/grafana-image.changes
index a14a14a4f..d22f8014a 100644
--- a/grafana-image/grafana-image.changes
+++ b/grafana-image/grafana-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/kea-image/Dockerfile b/kea-image/Dockerfile
index a53942d1c..9c38e047a 100644
--- a/kea-image/Dockerfile
+++ b/kea-image/Dockerfile
@@ -17,7 +17,6 @@
 
 #!BuildTag: suse/kea:2.6-%RELEASE%
 #!BuildTag: suse/kea:2.6
-#!BuildTag: suse/kea:latest
 #!BuildName: suse-kea-2.6
 #!BuildVersion: 15.7.2.6
 FROM suse/sle15:15.7
@@ -50,7 +49,7 @@ LABEL run="podman run --replace -it --privileged --network=host --name kea-dhcp4
 LABEL runcwd="podman run --replace -it --privileged --network=host --name kea-dhcp4 -v .:/etc/kea IMAGE kea-dhcp4  -c /etc/kea/kea-dhcp4.conf"
 LABEL run_dhcp6="podman run --replace -it --privileged --network=host --name kea-dhcp6 -v /etc/kea:/etc/kea IMAGE kea-dhcp6  -c /etc/kea/kea-dhcp6.conf"
 LABEL runcwd_dhcp6="podman run --replace -it --privileged --network=host --name kea-dhcp6 -v .:/etc/kea IMAGE kea-dhcp6  -c /etc/kea/kea-dhcp6.conf"
-EXPOSE 67 67/udp
+EXPOSE 67/tcp 67/udp
 
-    RUN mkdir -p /var/run/kea
-    
+ENV KEA_PIDFILE_DIR="/var/run/kea"
+RUN install -m 0750 -o root -g root -d /var/run/kea
diff --git a/kea-image/kea-image.changes b/kea-image/kea-image.changes
index 86764feca..53d9f8d86 100644
--- a/kea-image/kea-image.changes
+++ b/kea-image/kea-image.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
+-------------------------------------------------------------------
+Tue Dec  3 14:08:35 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- dockerfile fixes
+
 -------------------------------------------------------------------
 Wed Nov 27 08:43:47 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/nginx-image/_service b/nginx-image/_service
index 1c43539bb..baa813e3a 100644
--- a/nginx-image/_service
+++ b/nginx-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%nginx_version%%</param>
     <param name="package">nginx</param>
diff --git a/nginx-image/nginx-image.changes b/nginx-image/nginx-image.changes
index 256890a96..1b9af3a6c 100644
--- a/nginx-image/nginx-image.changes
+++ b/nginx-image/nginx-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Mon Nov 25 11:54:33 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/openjdk-21-devel-image/_service b/openjdk-21-devel-image/_service
index b7c7a3b73..b77d4da3d 100644
--- a/openjdk-21-devel-image/_service
+++ b/openjdk-21-devel-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%java_version%%</param>
     <param name="package">java-21-openjdk-devel</param>
diff --git a/openjdk-21-devel-image/openjdk-21-devel-image.changes b/openjdk-21-devel-image/openjdk-21-devel-image.changes
index a8e2b3e0e..cd8b42cb8 100644
--- a/openjdk-21-devel-image/openjdk-21-devel-image.changes
+++ b/openjdk-21-devel-image/openjdk-21-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/openjdk-21-image/_service b/openjdk-21-image/_service
index 0adb96f8d..d4f3995ff 100644
--- a/openjdk-21-image/_service
+++ b/openjdk-21-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%java_version%%</param>
     <param name="package">java-21-openjdk</param>
diff --git a/openjdk-21-image/openjdk-21-image.changes b/openjdk-21-image/openjdk-21-image.changes
index 6e89ab6ae..b8ff5caf8 100644
--- a/openjdk-21-image/openjdk-21-image.changes
+++ b/openjdk-21-image/openjdk-21-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/pcp-image/_service b/pcp-image/_service
index e80572ce0..279f57ee1 100644
--- a/pcp-image/_service
+++ b/pcp-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pcp_major%%</param>
     <param name="package">pcp</param>
     <param name="parse-version">major</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pcp_minor%%</param>
     <param name="package">pcp</param>
diff --git a/pcp-image/pcp-image.changes b/pcp-image/pcp-image.changes
index 99304feb7..af33019d2 100644
--- a/pcp-image/pcp-image.changes
+++ b/pcp-image/pcp-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Sun Nov 24 08:01:55 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/php-apache8-image/_service b/php-apache8-image/_service
index 1790ea34c..a96f9f412 100644
--- a/php-apache8-image/_service
+++ b/php-apache8-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%composer_version%%</param>
     <param name="package">php-composer2</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%php_version%%</param>
     <param name="package">php8</param>
diff --git a/php-apache8-image/php-apache8-image.changes b/php-apache8-image/php-apache8-image.changes
index 22ac242ee..3ea250dc6 100644
--- a/php-apache8-image/php-apache8-image.changes
+++ b/php-apache8-image/php-apache8-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/php-fpm8-image/_service b/php-fpm8-image/_service
index 1790ea34c..a96f9f412 100644
--- a/php-fpm8-image/_service
+++ b/php-fpm8-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%composer_version%%</param>
     <param name="package">php-composer2</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%php_version%%</param>
     <param name="package">php8</param>
diff --git a/php-fpm8-image/php-fpm8-image.changes b/php-fpm8-image/php-fpm8-image.changes
index c82f65f85..d72646794 100644
--- a/php-fpm8-image/php-fpm8-image.changes
+++ b/php-fpm8-image/php-fpm8-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/php8-image/_service b/php8-image/_service
index 1790ea34c..a96f9f412 100644
--- a/php8-image/_service
+++ b/php8-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%composer_version%%</param>
     <param name="package">php-composer2</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%php_version%%</param>
     <param name="package">php8</param>
diff --git a/php8-image/php8-image.changes b/php8-image/php8-image.changes
index 19259cc3e..decae5dac 100644
--- a/php8-image/php8-image.changes
+++ b/php8-image/php8-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/postgres-16-image/Dockerfile b/postgres-16-image/Dockerfile
index b31e4d167..6b4049c35 100644
--- a/postgres-16-image/Dockerfile
+++ b/postgres-16-image/Dockerfile
@@ -45,7 +45,6 @@ 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.supportlevel.until="2031-07-31"
 LABEL com.suse.eula="sle-eula"
 LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.release-stage="beta"
diff --git a/postgres-16-image/_service b/postgres-16-image/_service
index 327294ea2..9863c6f66 100644
--- a/postgres-16-image/_service
+++ b/postgres-16-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pg_minor_version%%</param>
     <param name="package">postgresql16-server</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pg_patch_version%%</param>
     <param name="package">postgresql16-server</param>
diff --git a/postgres-16-image/postgres-16-image.changes b/postgres-16-image/postgres-16-image.changes
index 7e5335df2..467b2676e 100644
--- a/postgres-16-image/postgres-16-image.changes
+++ b/postgres-16-image/postgres-16-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Mon Dec  2 15:18:44 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/postgres-17-image/Dockerfile b/postgres-17-image/Dockerfile
index 82b39c2f0..9ba4b258e 100644
--- a/postgres-17-image/Dockerfile
+++ b/postgres-17-image/Dockerfile
@@ -46,7 +46,6 @@ 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.supportlevel.until="2031-07-31"
 LABEL com.suse.eula="sle-eula"
 LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.release-stage="beta"
diff --git a/postgres-17-image/_service b/postgres-17-image/_service
index 1495c1062..694e631e7 100644
--- a/postgres-17-image/_service
+++ b/postgres-17-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pg_minor_version%%</param>
     <param name="package">postgresql17-server</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pg_patch_version%%</param>
     <param name="package">postgresql17-server</param>
diff --git a/postgres-17-image/postgres-17-image.changes b/postgres-17-image/postgres-17-image.changes
index 3f6d074df..51c264991 100644
--- a/postgres-17-image/postgres-17-image.changes
+++ b/postgres-17-image/postgres-17-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Mon Dec  2 15:18:44 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/prometheus-image/_service b/prometheus-image/_service
index 37216f1af..b883186eb 100644
--- a/prometheus-image/_service
+++ b/prometheus-image/_service
@@ -1,19 +1,19 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%prometheus_major_version%%</param>
     <param name="package">golang-github-prometheus-prometheus</param>
     <param name="parse-version">major</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%prometheus_minor_version%%</param>
     <param name="package">golang-github-prometheus-prometheus</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%prometheus_patch_version%%</param>
     <param name="package">golang-github-prometheus-prometheus</param>
diff --git a/prometheus-image/prometheus-image.changes b/prometheus-image/prometheus-image.changes
index f6f7bfd4f..5e4f93f14 100644
--- a/prometheus-image/prometheus-image.changes
+++ b/prometheus-image/prometheus-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/python-3.11-image/_service b/python-3.11-image/_service
index 151ea57d3..974a7d78d 100644
--- a/python-3.11-image/_service
+++ b/python-3.11-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%py311_ver%%</param>
     <param name="package">python311-base</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pip_ver%%</param>
     <param name="package">python311-pip</param>
diff --git a/python-3.11-image/python-3.11-image.changes b/python-3.11-image/python-3.11-image.changes
index 16185f49d..097bd0fad 100644
--- a/python-3.11-image/python-3.11-image.changes
+++ b/python-3.11-image/python-3.11-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Nov 27 10:55:28 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/python-3.13-image/_service b/python-3.13-image/_service
index fb3f0fcfc..5e7e54f29 100644
--- a/python-3.13-image/_service
+++ b/python-3.13-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%py313_ver%%</param>
     <param name="package">python313-base</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pip_ver%%</param>
     <param name="package">python313-pip</param>
diff --git a/python-3.13-image/python-3.13-image.changes b/python-3.13-image/python-3.13-image.changes
index 2f5553969..13c013388 100644
--- a/python-3.13-image/python-3.13-image.changes
+++ b/python-3.13-image/python-3.13-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Nov 27 10:55:28 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/rmt-mariadb-client-image/_service b/rmt-mariadb-client-image/_service
index 316904b34..be30a2505 100644
--- a/rmt-mariadb-client-image/_service
+++ b/rmt-mariadb-client-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%mariadb_version%%</param>
     <param name="package">mariadb-client</param>
diff --git a/rmt-mariadb-client-image/rmt-mariadb-client-image.changes b/rmt-mariadb-client-image/rmt-mariadb-client-image.changes
index ca38d66fc..282e3e36b 100644
--- a/rmt-mariadb-client-image/rmt-mariadb-client-image.changes
+++ b/rmt-mariadb-client-image/rmt-mariadb-client-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Mon Nov 25 11:54:57 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/rmt-mariadb-image/_service b/rmt-mariadb-image/_service
index d74dec77d..f8aa6f68e 100644
--- a/rmt-mariadb-image/_service
+++ b/rmt-mariadb-image/_service
@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">docker-entrypoint.sh</param>
     <param name="regex">%%mariadb_version%%</param>
     <param name="package">mariadb</param>
     <param name="parse-version">patch</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%mariadb_version%%</param>
     <param name="package">mariadb</param>
diff --git a/rmt-mariadb-image/rmt-mariadb-image.changes b/rmt-mariadb-image/rmt-mariadb-image.changes
index 2dc22dd7c..2bdb406e8 100644
--- a/rmt-mariadb-image/rmt-mariadb-image.changes
+++ b/rmt-mariadb-image/rmt-mariadb-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Mon Nov 25 11:54:57 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/rmt-server-image/_service b/rmt-server-image/_service
index c9d649f87..79de89557 100644
--- a/rmt-server-image/_service
+++ b/rmt-server-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%rmt_version%%</param>
     <param name="package">rmt-server</param>
diff --git a/rmt-server-image/rmt-server-image.changes b/rmt-server-image/rmt-server-image.changes
index 90f5f1145..38b2d9e3e 100644
--- a/rmt-server-image/rmt-server-image.changes
+++ b/rmt-server-image/rmt-server-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Thu Oct 31 16:24:48 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/ruby-2.5-image/_service b/ruby-2.5-image/_service
index 5d3d0d6b7..1535f9c80 100644
--- a/ruby-2.5-image/_service
+++ b/ruby-2.5-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%rb_ver%%</param>
     <param name="package">ruby2.5</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%rb_maj%%</param>
     <param name="package">ruby2.5</param>
diff --git a/ruby-2.5-image/ruby-2.5-image.changes b/ruby-2.5-image/ruby-2.5-image.changes
index 9c45d1d9c..8879ead59 100644
--- a/ruby-2.5-image/ruby-2.5-image.changes
+++ b/ruby-2.5-image/ruby-2.5-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/rust-oldstable-image/_service b/rust-oldstable-image/_service
index f09abcb60..b02a1d842 100644
--- a/rust-oldstable-image/_service
+++ b/rust-oldstable-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%RUST_VERSION%%</param>
     <param name="package">rust1.81</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%CARGO_VERSION%%</param>
     <param name="package">cargo1.81</param>
diff --git a/rust-oldstable-image/rust-oldstable-image.changes b/rust-oldstable-image/rust-oldstable-image.changes
index bcf8d22a1..3b33275b9 100644
--- a/rust-oldstable-image/rust-oldstable-image.changes
+++ b/rust-oldstable-image/rust-oldstable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Mon Nov  4 13:48:01 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/rust-stable-image/_service b/rust-stable-image/_service
index fc264f07c..ef98cafe3 100644
--- a/rust-stable-image/_service
+++ b/rust-stable-image/_service
@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%RUST_VERSION%%</param>
     <param name="package">rust1.82</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%CARGO_VERSION%%</param>
     <param name="package">cargo1.82</param>
diff --git a/rust-stable-image/rust-stable-image.changes b/rust-stable-image/rust-stable-image.changes
index 686edc9f8..d1b5e819e 100644
--- a/rust-stable-image/rust-stable-image.changes
+++ b/rust-stable-image/rust-stable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Mon Nov  4 13:48:09 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/sac-postfix-image/_service b/sac-postfix-image/_service
index f2f2a64ca..83d6e8059 100644
--- a/sac-postfix-image/_service
+++ b/sac-postfix-image/_service
@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">Dockerfile</param>
     <param name="regex">%%postfix_version%%</param>
     <param name="package">postfix</param>
diff --git a/sac-postfix-image/sac-postfix-image.changes b/sac-postfix-image/sac-postfix-image.changes
index 71190ee5f..f310dadae 100644
--- a/sac-postfix-image/sac-postfix-image.changes
+++ b/sac-postfix-image/sac-postfix-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 14:08:38 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Sun Nov 24 08:01:55 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>