diff --git a/.obs/dockerfile/SL-Micro-baremetal-container/Dockerfile b/.obs/dockerfile/SL-Micro-baremetal-container/Dockerfile
index 24d479740..bef32bf38 100644
--- a/.obs/dockerfile/SL-Micro-baremetal-container/Dockerfile
+++ b/.obs/dockerfile/SL-Micro-baremetal-container/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # Define the names/tags of the container
-#!BuildName: SL-Micro-container
+#!BuildName: SL-Micro-baremetal-container
 #!BuildTag: suse/sl-micro/%%SLMICRO_VERSION%%/baremetal-os-container:latest
 #!BuildTag: suse/sl-micro/%%SLMICRO_VERSION%%/baremetal-os-container:%VERSION%
 #!BuildTag: suse/sl-micro/%%SLMICRO_VERSION%%/baremetal-os-container:%VERSION%-%RELEASE%
diff --git a/.obs/dockerfile/build-baremetal-disk-image/Dockerfile b/.obs/dockerfile/SL-Micro-baremetal-container/Dockerfile.disk
similarity index 100%
rename from .obs/dockerfile/build-baremetal-disk-image/Dockerfile
rename to .obs/dockerfile/SL-Micro-baremetal-container/Dockerfile.disk
diff --git a/.obs/dockerfile/build-baremetal-iso-image/Dockerfile b/.obs/dockerfile/SL-Micro-baremetal-container/Dockerfile.iso
similarity index 100%
rename from .obs/dockerfile/build-baremetal-iso-image/Dockerfile
rename to .obs/dockerfile/SL-Micro-baremetal-container/Dockerfile.iso
diff --git a/.obs/dockerfile/SL-Micro-baremetal-container/_multibuild b/.obs/dockerfile/SL-Micro-baremetal-container/_multibuild
new file mode 100644
index 000000000..50de4a685
--- /dev/null
+++ b/.obs/dockerfile/SL-Micro-baremetal-container/_multibuild
@@ -0,0 +1,4 @@
+<multibuild>
+  <flavor>iso</flavor>
+  <flavor>disk</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-baremetal-container/_service b/.obs/dockerfile/SL-Micro-baremetal-container/_service
index 16c5f6738..74b2b2090 100644
--- a/.obs/dockerfile/SL-Micro-baremetal-container/_service
+++ b/.obs/dockerfile/SL-Micro-baremetal-container/_service
@@ -11,4 +11,24 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
+    <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.disk</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.disk</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/.obs/dockerfile/build-baremetal-iso-image/manifest.yaml b/.obs/dockerfile/SL-Micro-baremetal-container/manifest.yaml
similarity index 100%
rename from .obs/dockerfile/build-baremetal-iso-image/manifest.yaml
rename to .obs/dockerfile/SL-Micro-baremetal-container/manifest.yaml
diff --git a/.obs/dockerfile/build-base-iso-image/Dockerfile b/.obs/dockerfile/SL-Micro-base-container/Dockerfile.iso
similarity index 96%
rename from .obs/dockerfile/build-base-iso-image/Dockerfile
rename to .obs/dockerfile/SL-Micro-base-container/Dockerfile.iso
index 846df96f3..49f060636 100644
--- a/.obs/dockerfile/build-base-iso-image/Dockerfile
+++ b/.obs/dockerfile/SL-Micro-base-container/Dockerfile.iso
@@ -10,7 +10,7 @@
 ARG SLMICRO_VERSION
 
 FROM suse/sl-micro/${SLMICRO_VERSION}/base-os-container:latest AS os
-FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/base-os-container:latest AS builder
 
 WORKDIR /iso
 
diff --git a/.obs/dockerfile/SL-Micro-base-container/_multibuild b/.obs/dockerfile/SL-Micro-base-container/_multibuild
new file mode 100644
index 000000000..08c9878db
--- /dev/null
+++ b/.obs/dockerfile/SL-Micro-base-container/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>iso</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-base-container/_service b/.obs/dockerfile/SL-Micro-base-container/_service
index 16c5f6738..e7bd3bc50 100644
--- a/.obs/dockerfile/SL-Micro-base-container/_service
+++ b/.obs/dockerfile/SL-Micro-base-container/_service
@@ -11,4 +11,14 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/.obs/dockerfile/build-base-iso-image/manifest.yaml b/.obs/dockerfile/SL-Micro-base-container/manifest.yaml
similarity index 100%
rename from .obs/dockerfile/build-base-iso-image/manifest.yaml
rename to .obs/dockerfile/SL-Micro-base-container/manifest.yaml
diff --git a/.obs/dockerfile/build-k3s-selinux-iso-image/Dockerfile b/.obs/dockerfile/SL-Micro-k3s-selinux-container/Dockerfile.iso
similarity index 96%
rename from .obs/dockerfile/build-k3s-selinux-iso-image/Dockerfile
rename to .obs/dockerfile/SL-Micro-k3s-selinux-container/Dockerfile.iso
index c525e0483..ff9afe970 100644
--- a/.obs/dockerfile/build-k3s-selinux-iso-image/Dockerfile
+++ b/.obs/dockerfile/SL-Micro-k3s-selinux-container/Dockerfile.iso
@@ -10,7 +10,7 @@
 ARG SLMICRO_VERSION
 
 FROM suse/sl-micro/${SLMICRO_VERSION}/k3s-selinux-os-container:latest AS os
-FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/k3s-selinux-os-container:latest AS builder
 
 WORKDIR /iso
 
diff --git a/.obs/dockerfile/SL-Micro-k3s-selinux-container/_multibuild b/.obs/dockerfile/SL-Micro-k3s-selinux-container/_multibuild
new file mode 100644
index 000000000..08c9878db
--- /dev/null
+++ b/.obs/dockerfile/SL-Micro-k3s-selinux-container/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>iso</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-k3s-selinux-container/_service b/.obs/dockerfile/SL-Micro-k3s-selinux-container/_service
index 16c5f6738..0cc1535c1 100644
--- a/.obs/dockerfile/SL-Micro-k3s-selinux-container/_service
+++ b/.obs/dockerfile/SL-Micro-k3s-selinux-container/_service
@@ -11,4 +11,14 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+    <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/.obs/dockerfile/build-k3s-selinux-iso-image/manifest.yaml b/.obs/dockerfile/SL-Micro-k3s-selinux-container/manifest.yaml
similarity index 100%
rename from .obs/dockerfile/build-k3s-selinux-iso-image/manifest.yaml
rename to .obs/dockerfile/SL-Micro-k3s-selinux-container/manifest.yaml
diff --git a/.obs/dockerfile/build-kvm-iso-image/Dockerfile b/.obs/dockerfile/SL-Micro-kvm-container/Dockerfile.iso
similarity index 96%
rename from .obs/dockerfile/build-kvm-iso-image/Dockerfile
rename to .obs/dockerfile/SL-Micro-kvm-container/Dockerfile.iso
index 8edf0053e..e7be20e0c 100644
--- a/.obs/dockerfile/build-kvm-iso-image/Dockerfile
+++ b/.obs/dockerfile/SL-Micro-kvm-container/Dockerfile.iso
@@ -10,7 +10,7 @@
 ARG SLMICRO_VERSION
 
 FROM suse/sl-micro/${SLMICRO_VERSION}/kvm-os-container:latest AS os
-FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/kvm-os-container:latest AS builder
 
 WORKDIR /iso
 
diff --git a/.obs/dockerfile/SL-Micro-kvm-container/_multibuild b/.obs/dockerfile/SL-Micro-kvm-container/_multibuild
new file mode 100644
index 000000000..08c9878db
--- /dev/null
+++ b/.obs/dockerfile/SL-Micro-kvm-container/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>iso</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-kvm-container/_service b/.obs/dockerfile/SL-Micro-kvm-container/_service
index 16c5f6738..0cc1535c1 100644
--- a/.obs/dockerfile/SL-Micro-kvm-container/_service
+++ b/.obs/dockerfile/SL-Micro-kvm-container/_service
@@ -11,4 +11,14 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+    <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/.obs/dockerfile/build-kvm-iso-image/manifest.yaml b/.obs/dockerfile/SL-Micro-kvm-container/manifest.yaml
similarity index 100%
rename from .obs/dockerfile/build-kvm-iso-image/manifest.yaml
rename to .obs/dockerfile/SL-Micro-kvm-container/manifest.yaml
diff --git a/.obs/dockerfile/build-rke2-selinux-iso-image/Dockerfile b/.obs/dockerfile/SL-Micro-rke2-selinux-container/Dockerfile.iso
similarity index 96%
rename from .obs/dockerfile/build-rke2-selinux-iso-image/Dockerfile
rename to .obs/dockerfile/SL-Micro-rke2-selinux-container/Dockerfile.iso
index e7016d985..fdad91cc7 100644
--- a/.obs/dockerfile/build-rke2-selinux-iso-image/Dockerfile
+++ b/.obs/dockerfile/SL-Micro-rke2-selinux-container/Dockerfile.iso
@@ -10,7 +10,7 @@
 ARG SLMICRO_VERSION
 
 FROM suse/sl-micro/${SLMICRO_VERSION}/rke2-selinux-os-container:latest AS os
-FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/rke2-selinux-os-container:latest AS builder
 
 WORKDIR /iso
 
diff --git a/.obs/dockerfile/SL-Micro-rke2-selinux-container/_multibuild b/.obs/dockerfile/SL-Micro-rke2-selinux-container/_multibuild
new file mode 100644
index 000000000..08c9878db
--- /dev/null
+++ b/.obs/dockerfile/SL-Micro-rke2-selinux-container/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>iso</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-rke2-selinux-container/_service b/.obs/dockerfile/SL-Micro-rke2-selinux-container/_service
index 16c5f6738..e7bd3bc50 100644
--- a/.obs/dockerfile/SL-Micro-rke2-selinux-container/_service
+++ b/.obs/dockerfile/SL-Micro-rke2-selinux-container/_service
@@ -11,4 +11,14 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/.obs/dockerfile/build-rke2-selinux-iso-image/manifest.yaml b/.obs/dockerfile/SL-Micro-rke2-selinux-container/manifest.yaml
similarity index 100%
rename from .obs/dockerfile/build-rke2-selinux-iso-image/manifest.yaml
rename to .obs/dockerfile/SL-Micro-rke2-selinux-container/manifest.yaml
diff --git a/.obs/dockerfile/build-rt-iso-image/Dockerfile b/.obs/dockerfile/SL-Micro-rt-container/Dockerfile.iso
similarity index 96%
rename from .obs/dockerfile/build-rt-iso-image/Dockerfile
rename to .obs/dockerfile/SL-Micro-rt-container/Dockerfile.iso
index 50a1bd77e..f8ab8a563 100644
--- a/.obs/dockerfile/build-rt-iso-image/Dockerfile
+++ b/.obs/dockerfile/SL-Micro-rt-container/Dockerfile.iso
@@ -11,7 +11,7 @@
 ARG SLMICRO_VERSION
 
 FROM suse/sl-micro/${SLMICRO_VERSION}/rt-os-container:latest AS os
-FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/rt-os-container:latest AS builder
 
 WORKDIR /iso
 
diff --git a/.obs/dockerfile/SL-Micro-rt-container/_multibuild b/.obs/dockerfile/SL-Micro-rt-container/_multibuild
new file mode 100644
index 000000000..08c9878db
--- /dev/null
+++ b/.obs/dockerfile/SL-Micro-rt-container/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>iso</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-rt-container/_service b/.obs/dockerfile/SL-Micro-rt-container/_service
index 16c5f6738..e7bd3bc50 100644
--- a/.obs/dockerfile/SL-Micro-rt-container/_service
+++ b/.obs/dockerfile/SL-Micro-rt-container/_service
@@ -11,4 +11,14 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/.obs/dockerfile/build-rt-iso-image/manifest.yaml b/.obs/dockerfile/SL-Micro-rt-container/manifest.yaml
similarity index 100%
rename from .obs/dockerfile/build-rt-iso-image/manifest.yaml
rename to .obs/dockerfile/SL-Micro-rt-container/manifest.yaml
diff --git a/.obs/dockerfile/build-baremetal-disk-image/_service b/.obs/dockerfile/build-baremetal-disk-image/_service
deleted file mode 100644
index 16c5f6738..000000000
--- a/.obs/dockerfile/build-baremetal-disk-image/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-<services>
-  <service name="docker_label_helper" mode="buildtime"/>
-  <service name="kiwi_metainfo_helper" mode="buildtime"/>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
-    <param name="var">SLMICRO_VERSION</param>
-  </service>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
-    <param name="var">IMG_REPO</param>
-  </service>
-</services>
diff --git a/.obs/dockerfile/build-baremetal-iso-image/_service b/.obs/dockerfile/build-baremetal-iso-image/_service
deleted file mode 100644
index 16c5f6738..000000000
--- a/.obs/dockerfile/build-baremetal-iso-image/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-<services>
-  <service name="docker_label_helper" mode="buildtime"/>
-  <service name="kiwi_metainfo_helper" mode="buildtime"/>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
-    <param name="var">SLMICRO_VERSION</param>
-  </service>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
-    <param name="var">IMG_REPO</param>
-  </service>
-</services>
diff --git a/.obs/dockerfile/build-base-iso-image/_service b/.obs/dockerfile/build-base-iso-image/_service
deleted file mode 100644
index 16c5f6738..000000000
--- a/.obs/dockerfile/build-base-iso-image/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-<services>
-  <service name="docker_label_helper" mode="buildtime"/>
-  <service name="kiwi_metainfo_helper" mode="buildtime"/>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
-    <param name="var">SLMICRO_VERSION</param>
-  </service>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
-    <param name="var">IMG_REPO</param>
-  </service>
-</services>
diff --git a/.obs/dockerfile/build-k3s-selinux-iso-image/_service b/.obs/dockerfile/build-k3s-selinux-iso-image/_service
deleted file mode 100644
index 606d7c738..000000000
--- a/.obs/dockerfile/build-k3s-selinux-iso-image/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-<services>
-  <service name="kiwi_metainfo_helper" mode="buildtime"/>
-  <service name="docker_label_helper" mode="buildtime"/>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
-    <param name="var">SLMICRO_VERSION</param>
-  </service>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
-    <param name="var">IMG_REPO</param>
-  </service>
-</services>
diff --git a/.obs/dockerfile/build-kvm-iso-image/_service b/.obs/dockerfile/build-kvm-iso-image/_service
deleted file mode 100644
index 16c5f6738..000000000
--- a/.obs/dockerfile/build-kvm-iso-image/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-<services>
-  <service name="docker_label_helper" mode="buildtime"/>
-  <service name="kiwi_metainfo_helper" mode="buildtime"/>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
-    <param name="var">SLMICRO_VERSION</param>
-  </service>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
-    <param name="var">IMG_REPO</param>
-  </service>
-</services>
diff --git a/.obs/dockerfile/build-rke2-selinux-iso-image/_service b/.obs/dockerfile/build-rke2-selinux-iso-image/_service
deleted file mode 100644
index 606d7c738..000000000
--- a/.obs/dockerfile/build-rke2-selinux-iso-image/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-<services>
-  <service name="kiwi_metainfo_helper" mode="buildtime"/>
-  <service name="docker_label_helper" mode="buildtime"/>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
-    <param name="var">SLMICRO_VERSION</param>
-  </service>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
-    <param name="var">IMG_REPO</param>
-  </service>
-</services>
diff --git a/.obs/dockerfile/build-rt-iso-image/_service b/.obs/dockerfile/build-rt-iso-image/_service
deleted file mode 100644
index 16c5f6738..000000000
--- a/.obs/dockerfile/build-rt-iso-image/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-<services>
-  <service name="docker_label_helper" mode="buildtime"/>
-  <service name="kiwi_metainfo_helper" mode="buildtime"/>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
-    <param name="var">SLMICRO_VERSION</param>
-  </service>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
-    <param name="var">IMG_REPO</param>
-  </service>
-</services>