diff --git a/.gitmodules b/.gitmodules
index 3ae35a2..491b9f9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,12 @@
 [submodule "cri-tools"]
 	path = cri-tools
 	url = https://src.opensuse.org/pool/cri-tools.git
+[submodule "fakeroot"]
+	path = fakeroot
+	url = https://src.opensuse.org/pool/fakeroot.git
+[submodule "crudini"]
+	path = crudini
+	url = https://src.opensuse.org/pool/crudini.git
+[submodule "ipcalc"]
+	path = ipcalc
+	url = https://src.opensuse.org/pool/ipcalc.git
diff --git a/crudini b/crudini
new file mode 160000
index 0000000..c24bedd
--- /dev/null
+++ b/crudini
@@ -0,0 +1 @@
+Subproject commit c24bedd13bbd6ec8ac6edfc9b7495c94667e77af6dfbc681255650a392f4024c
diff --git a/fakeroot b/fakeroot
new file mode 160000
index 0000000..a93afed
--- /dev/null
+++ b/fakeroot
@@ -0,0 +1 @@
+Subproject commit a93afedfbd09dc0396c3f9edf415f3ad22cd24c7f0ff9ff72407d10c748ce0a5
diff --git a/ipcalc b/ipcalc
new file mode 160000
index 0000000..956ad4f
--- /dev/null
+++ b/ipcalc
@@ -0,0 +1 @@
+Subproject commit 956ad4f6576a30a5f6c3808e3f22c371f8ee0de266233b721091badbe40b35de
diff --git a/openstack-ironic-image/openstack-ironic-image.kiwi b/openstack-ironic-image/openstack-ironic-image.kiwi
index 2256a82..5a1be61 100644
--- a/openstack-ironic-image/openstack-ironic-image.kiwi
+++ b/openstack-ironic-image/openstack-ironic-image.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="7.4" name="openstack-ironic-image-200">
+<image schemaversion="7.4" name="openstack-ironic-image">
     <description type="system">
         <author>Cloud developers</author>
         <contact>cloud-devel@suse.de</contact>
@@ -128,7 +128,7 @@
         <package name="kernel-firmware"/>
         <package name="kernel-default"/>
         <package name="NetworkManager"/>
-        <package name="nm-configurator-031"/>
+        <package name="nm-configurator"/>
         <package name="timezone"/>
         <package name="haveged"/>
         <!-- ironic-python-agent specific -->