diff --git a/nodejs-18-image/_service b/nodejs-18-image/_service
index 794158b56..7f086271c 100644
--- a/nodejs-18-image/_service
+++ b/nodejs-18-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">%%nodejs_version%%</param>
     <param name="package">nodejs18</param>
diff --git a/nodejs-18-image/nodejs-18-image.changes b/nodejs-18-image/nodejs-18-image.changes
index dc7acf4cb..ef5a3b3fd 100644
--- a/nodejs-18-image/nodejs-18-image.changes
+++ b/nodejs-18-image/nodejs-18-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 08:40:42 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:20 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/openjdk-11-devel-image/_service b/openjdk-11-devel-image/_service
index 65f5a3c7b..c32f677f3 100644
--- a/openjdk-11-devel-image/_service
+++ b/openjdk-11-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-11-openjdk-devel</param>
diff --git a/openjdk-11-devel-image/openjdk-11-devel-image.changes b/openjdk-11-devel-image/openjdk-11-devel-image.changes
index 5547f1b52..8e79bf2ae 100644
--- a/openjdk-11-devel-image/openjdk-11-devel-image.changes
+++ b/openjdk-11-devel-image/openjdk-11-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 08:40:42 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:20 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/openjdk-11-image/_service b/openjdk-11-image/_service
index 5296c8efa..607f197c8 100644
--- a/openjdk-11-image/_service
+++ b/openjdk-11-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-11-openjdk</param>
diff --git a/openjdk-11-image/openjdk-11-image.changes b/openjdk-11-image/openjdk-11-image.changes
index fc1f13110..b2117c648 100644
--- a/openjdk-11-image/openjdk-11-image.changes
+++ b/openjdk-11-image/openjdk-11-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 08:40:42 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:20 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/openjdk-17-devel-image/_service b/openjdk-17-devel-image/_service
index 7a541a057..bd308f47e 100644
--- a/openjdk-17-devel-image/_service
+++ b/openjdk-17-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-17-openjdk-devel</param>
diff --git a/openjdk-17-devel-image/openjdk-17-devel-image.changes b/openjdk-17-devel-image/openjdk-17-devel-image.changes
index 65a401c63..cac023bfd 100644
--- a/openjdk-17-devel-image/openjdk-17-devel-image.changes
+++ b/openjdk-17-devel-image/openjdk-17-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 08:40:42 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:20 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/openjdk-17-image/_service b/openjdk-17-image/_service
index 59ee664fd..fcd7f4e8f 100644
--- a/openjdk-17-image/_service
+++ b/openjdk-17-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-17-openjdk</param>
diff --git a/openjdk-17-image/openjdk-17-image.changes b/openjdk-17-image/openjdk-17-image.changes
index a975f1f8e..e5185da9f 100644
--- a/openjdk-17-image/openjdk-17-image.changes
+++ b/openjdk-17-image/openjdk-17-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 08:40:42 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:20 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/postgres-15-image/_service b/postgres-15-image/_service
index 051d579fc..c7bddfb9d 100644
--- a/postgres-15-image/_service
+++ b/postgres-15-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">postgresql15-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">postgresql15-server</param>
diff --git a/postgres-15-image/postgres-15-image.changes b/postgres-15-image/postgres-15-image.changes
index 8f78d8c06..05c8d0afd 100644
--- a/postgres-15-image/postgres-15-image.changes
+++ b/postgres-15-image/postgres-15-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 08:40:42 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
 -------------------------------------------------------------------
 Mon Dec  2 15:18:26 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>