diff --git a/confluent_deploy/confluent_deploy.spec b/confluent_deploy/confluent_deploy.spec
index d4de71f0..4e63827f 100644
--- a/confluent_deploy/confluent_deploy.spec
+++ b/confluent_deploy/confluent_deploy.spec
@@ -1,12 +1,12 @@
 Name: confluent_deploy-x86_64
 Version: 3.0
-Release 1%{?dist}
+Release: 1
 Summary: OS Deployment support for confluent
 
 License: Apache2
 URL: http://hpc.lenovo.com/
 Source0: confluent-deploy.tar.xz
-BulidArch: noarch
+BuildArch: noarch
 Requires: confluent_ipxe
 BuildRoot: /tmp
 
@@ -25,24 +25,22 @@ cd utils
 make all
 cp copernicus clortho autocons ../opt/confluent/bin
 cd ..
-mkdir el8out suse15out ubuntu20.04out
-cd el8out
-cp -a ../opt .
-mkdir -p usr/lib/dracut/hooks/
-cp -a ../el8/dracut-hooks/* usr/lib/dracut/hooks/
-find . | cpio -H newc > addons.cpio
-cd ../suse15out
-cp -a ../opt .
-cp -a ../suse15/opt ../suse15/etc .
-find . | cpio -H newc > addons.cpio
-cd ../ubuntu20.04out
-cp -a ../opt .
-cp -a ../ubuntu20.04/initramfs/* .
-find . | cpio -H newc > addons.cpio
+for os in el8 suse15 ubuntu20.04; do
+    mkdir ${os}out
+    cd ${os}out
+    cp -a ../opt .
+    cp -a ../{os}/initramfs/* .
+    find . | cpio -H newc -o > addons.cpio
+    cd ..
+done
 
 %install
-pwd
-ls
-
-
+for os in el8 suse15 ubuntu20.04; do
+    mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs
+    mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles
+    cp ${os}out/addons.cpio %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs
+    cp -a $os/profiles/* /opt/confluent/lib/osdeploy/$os/profiles
+done
 
+%files
+/opt/confluent/lib/osdeploy
diff --git a/confluent_deploy/el8/dracut-hooks/cmdline/01-confluent.sh b/confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh
similarity index 100%
rename from confluent_deploy/el8/dracut-hooks/cmdline/01-confluent.sh
rename to confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh
diff --git a/confluent_deploy/el8/dracut-hooks/initqueue/01-confluent.sh b/confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh
similarity index 100%
rename from confluent_deploy/el8/dracut-hooks/initqueue/01-confluent.sh
rename to confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh
diff --git a/confluent_deploy/el8/dracut-hooks/pre-pivot/01-confluent.sh b/confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
similarity index 100%
rename from confluent_deploy/el8/dracut-hooks/pre-pivot/01-confluent.sh
rename to confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
diff --git a/confluent_deploy/el8/kickstart b/confluent_deploy/el8/profiles/default/kickstart
similarity index 100%
rename from confluent_deploy/el8/kickstart
rename to confluent_deploy/el8/profiles/default/kickstart
diff --git a/confluent_deploy/suse15/etc/linuxrc.d/01-confluent b/confluent_deploy/suse15/initramfs/etc/linuxrc.d/01-confluent
similarity index 100%
rename from confluent_deploy/suse15/etc/linuxrc.d/01-confluent
rename to confluent_deploy/suse15/initramfs/etc/linuxrc.d/01-confluent
diff --git a/confluent_deploy/suse15/opt/confluent/bin/suseagent b/confluent_deploy/suse15/initramfs/opt/confluent/bin/suseagent
similarity index 100%
rename from confluent_deploy/suse15/opt/confluent/bin/suseagent
rename to confluent_deploy/suse15/initramfs/opt/confluent/bin/suseagent
diff --git a/confluent_deploy/suse15/autoyast b/confluent_deploy/suse15/profiles/default/autoyast
similarity index 100%
rename from confluent_deploy/suse15/autoyast
rename to confluent_deploy/suse15/profiles/default/autoyast
diff --git a/confluent_deploy/ubuntu20.04/autoinstall/meta-data b/confluent_deploy/ubuntu20.04/profiles/default/autoinstall/meta-data
similarity index 100%
rename from confluent_deploy/ubuntu20.04/autoinstall/meta-data
rename to confluent_deploy/ubuntu20.04/profiles/default/autoinstall/meta-data
diff --git a/confluent_deploy/ubuntu20.04/autoinstall/user-data b/confluent_deploy/ubuntu20.04/profiles/default/autoinstall/user-data
similarity index 100%
rename from confluent_deploy/ubuntu20.04/autoinstall/user-data
rename to confluent_deploy/ubuntu20.04/profiles/default/autoinstall/user-data