diff --git a/base-image/_service b/base-image/_service
index bd1abb02d..0593b7b3f 100644
--- a/base-image/_service
+++ b/base-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/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/kiwi-image/_service b/kiwi-image/_service
index 053a4f4f8..2bef4c2ab 100644
--- a/kiwi-image/_service
+++ b/kiwi-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/sle16-kernel-module-devel-image/_service b/sle16-kernel-module-devel-image/_service
index 053a4f4f8..2bef4c2ab 100644
--- a/sle16-kernel-module-devel-image/_service
+++ b/sle16-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