diff --git a/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl b/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl
index d59fd810..3730ef13 100644
--- a/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl
+++ b/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl
@@ -41,8 +41,8 @@ for os in rhvh4 el7 genesis el8 suse15 suse16 debian debian13 ubuntu20.04 ubuntu
     else
         cp -a ../opt .
     fi
-    cp -a ../${os}/initramfs/* .
     cp -a ../common/initramfs/* .
+    cp -a ../${os}/initramfs/* .
     find . | cpio -H newc -o > ../addons.cpio
     mv ../addons.cpio .
     cd ..
@@ -57,8 +57,8 @@ for os in el7 el8 suse15 suse16 el9 el10 ubuntu20.04 ubuntu22.04 ubuntu24.04 ubu
     else
         cp -a ../opt .
     fi
-    cp -a ../${os}-diskless/initramfs/* .
     cp -a ../common/initramfs/* .
+    cp -a ../${os}-diskless/initramfs/* .
     if [ -d ../${os}bin ]; then 
         cp -a ../${os}bin/stateless-bin/* opt/confluent/bin
     else
@@ -71,8 +71,8 @@ done
 mkdir esxi7out
 cd esxi7out
 cp -a ../opt .
-cp -a ../esxi7/initramfs/* .
 cp -a ../common/initramfs/* .
+cp -a ../esxi7/initramfs/* .
 chmod +x bin/* opt/confluent/bin/*
 tar zcvf ../addons.tgz *
 mv ../addons.tgz .
diff --git a/confluent_osdeploy/confluent_osdeploy.spec.tmpl b/confluent_osdeploy/confluent_osdeploy.spec.tmpl
index 2cb8465d..77f39c4c 100644
--- a/confluent_osdeploy/confluent_osdeploy.spec.tmpl
+++ b/confluent_osdeploy/confluent_osdeploy.spec.tmpl
@@ -43,8 +43,8 @@ for os in rhvh4 el7 genesis el8 suse15 suse16 debian debian13 ubuntu18.04 ubuntu
     else
         cp -a ../el8bin/opt .
     fi
-    cp -a ../${os}/initramfs/* .
     cp -a ../common/initramfs/* .
+    cp -a ../${os}/initramfs/* .
     find . | cpio -H newc -o > ../addons.cpio
     mv ../addons.cpio .
     cd ..
@@ -59,8 +59,8 @@ for os in el7 el8 suse15 suse16 el9 el10 ubuntu20.04 ubuntu22.04 ubuntu24.04 ubu
     else
         cp -a ../el8bin/opt .
     fi
-    cp -a ../${os}-diskless/initramfs/* .
     cp -a ../common/initramfs/* .
+    cp -a ../${os}-diskless/initramfs/* .
     if [ -d ../${os}bin ]; then 
         cp -a ../${os}bin/stateless-bin/* opt/confluent/bin
     else
@@ -73,8 +73,8 @@ done
 mkdir esxi7out
 cd esxi7out
 cp -a ../el8bin/opt .
-cp -a ../esxi7/initramfs/* .
 cp -a ../common/initramfs/* .
+cp -a ../esxi7/initramfs/* .
 chmod +x bin/* opt/confluent/bin/*
 tar zcvf ../addons.tgz *
 mv ../addons.tgz .
@@ -97,6 +97,7 @@ for os in rhvh4 el7 el8 el9 el10 genesis suse15 suse16 ubuntu20.04 debian debian
     for targ in %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles/*; do
         cp -a common/profile/* $targ
     done
+    cp -a $os/profiles/* %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles
     if [ -d ${os}disklessout ]; then
         mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/initramfs
         mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/profiles
@@ -105,6 +106,7 @@ for os in rhvh4 el7 el8 el9 el10 genesis suse15 suse16 ubuntu20.04 debian debian
         for targ in %{buildroot}/opt/confluent/lib/osdeploy/$os-diskless/profiles/*; do
             cp -a common/profile/* $targ
         done
+        cp -a ${os}-diskless/profiles/* %{buildroot}/opt/confluent/lib/osdeploy/$os-diskless/profiles
     fi
 done
 find %{buildroot}/opt/confluent/lib/osdeploy/ -name .gitignore -exec rm -f {} +