diff --git a/confluent_deploy/confluent_deploy.spec b/confluent_osdeploy/confluent_deploy.spec.tmpl
similarity index 98%
rename from confluent_deploy/confluent_deploy.spec
rename to confluent_osdeploy/confluent_deploy.spec.tmpl
index 4e63827f..19742b29 100644
--- a/confluent_deploy/confluent_deploy.spec
+++ b/confluent_osdeploy/confluent_deploy.spec.tmpl
@@ -1,5 +1,5 @@
 Name: confluent_deploy-x86_64
-Version: 3.0
+Version: #VERSION#
 Release: 1
 Summary: OS Deployment support for confluent
 
diff --git a/confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh
similarity index 100%
rename from confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh
rename to confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh
diff --git a/confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh
similarity index 100%
rename from confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh
rename to confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh
diff --git a/confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
similarity index 100%
rename from confluent_deploy/el8/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
rename to confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
diff --git a/confluent_deploy/el8/profiles/default/kickstart b/confluent_osdeploy/el8/profiles/default/kickstart
similarity index 100%
rename from confluent_deploy/el8/profiles/default/kickstart
rename to confluent_osdeploy/el8/profiles/default/kickstart
diff --git a/confluent_deploy/suse15/initramfs/etc/linuxrc.d/01-confluent b/confluent_osdeploy/suse15/initramfs/etc/linuxrc.d/01-confluent
similarity index 100%
rename from confluent_deploy/suse15/initramfs/etc/linuxrc.d/01-confluent
rename to confluent_osdeploy/suse15/initramfs/etc/linuxrc.d/01-confluent
diff --git a/confluent_deploy/suse15/initramfs/opt/confluent/bin/suseagent b/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent
similarity index 100%
rename from confluent_deploy/suse15/initramfs/opt/confluent/bin/suseagent
rename to confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent
diff --git a/confluent_deploy/suse15/profiles/default/autoyast b/confluent_osdeploy/suse15/profiles/default/autoyast
similarity index 100%
rename from confluent_deploy/suse15/profiles/default/autoyast
rename to confluent_osdeploy/suse15/profiles/default/autoyast
diff --git a/confluent_deploy/ubuntu20.04/initramfs/conf/conf.d/confluent b/confluent_osdeploy/ubuntu20.04/initramfs/conf/conf.d/confluent
similarity index 100%
rename from confluent_deploy/ubuntu20.04/initramfs/conf/conf.d/confluent
rename to confluent_osdeploy/ubuntu20.04/initramfs/conf/conf.d/confluent
diff --git a/confluent_deploy/ubuntu20.04/initramfs/custom-installation/firstboot.sh b/confluent_osdeploy/ubuntu20.04/initramfs/custom-installation/firstboot.sh
similarity index 100%
rename from confluent_deploy/ubuntu20.04/initramfs/custom-installation/firstboot.sh
rename to confluent_osdeploy/ubuntu20.04/initramfs/custom-installation/firstboot.sh
diff --git a/confluent_deploy/ubuntu20.04/initramfs/custom-installation/hooks/casper-bottom.sh b/confluent_osdeploy/ubuntu20.04/initramfs/custom-installation/hooks/casper-bottom.sh
similarity index 100%
rename from confluent_deploy/ubuntu20.04/initramfs/custom-installation/hooks/casper-bottom.sh
rename to confluent_osdeploy/ubuntu20.04/initramfs/custom-installation/hooks/casper-bottom.sh
diff --git a/confluent_deploy/ubuntu20.04/initramfs/custom-installation/post.sh b/confluent_osdeploy/ubuntu20.04/initramfs/custom-installation/post.sh
similarity index 100%
rename from confluent_deploy/ubuntu20.04/initramfs/custom-installation/post.sh
rename to confluent_osdeploy/ubuntu20.04/initramfs/custom-installation/post.sh
diff --git a/confluent_deploy/ubuntu20.04/initramfs/custom-installation/pre.sh b/confluent_osdeploy/ubuntu20.04/initramfs/custom-installation/pre.sh
similarity index 100%
rename from confluent_deploy/ubuntu20.04/initramfs/custom-installation/pre.sh
rename to confluent_osdeploy/ubuntu20.04/initramfs/custom-installation/pre.sh
diff --git a/confluent_deploy/ubuntu20.04/initramfs/scripts/init-premount/confluent b/confluent_osdeploy/ubuntu20.04/initramfs/scripts/init-premount/confluent
similarity index 100%
rename from confluent_deploy/ubuntu20.04/initramfs/scripts/init-premount/confluent
rename to confluent_osdeploy/ubuntu20.04/initramfs/scripts/init-premount/confluent
diff --git a/confluent_deploy/ubuntu20.04/profiles/default/autoinstall/meta-data b/confluent_osdeploy/ubuntu20.04/profiles/default/autoinstall/meta-data
similarity index 100%
rename from confluent_deploy/ubuntu20.04/profiles/default/autoinstall/meta-data
rename to confluent_osdeploy/ubuntu20.04/profiles/default/autoinstall/meta-data
diff --git a/confluent_deploy/ubuntu20.04/profiles/default/autoinstall/user-data b/confluent_osdeploy/ubuntu20.04/profiles/default/autoinstall/user-data
similarity index 100%
rename from confluent_deploy/ubuntu20.04/profiles/default/autoinstall/user-data
rename to confluent_osdeploy/ubuntu20.04/profiles/default/autoinstall/user-data
diff --git a/confluent_deploy/utils/Makefile b/confluent_osdeploy/utils/Makefile
similarity index 100%
rename from confluent_deploy/utils/Makefile
rename to confluent_osdeploy/utils/Makefile
diff --git a/confluent_deploy/utils/autocons.c b/confluent_osdeploy/utils/autocons.c
similarity index 100%
rename from confluent_deploy/utils/autocons.c
rename to confluent_osdeploy/utils/autocons.c
diff --git a/confluent_deploy/utils/clortho.c b/confluent_osdeploy/utils/clortho.c
similarity index 100%
rename from confluent_deploy/utils/clortho.c
rename to confluent_osdeploy/utils/clortho.c
diff --git a/confluent_deploy/utils/copernicus.c b/confluent_osdeploy/utils/copernicus.c
similarity index 100%
rename from confluent_deploy/utils/copernicus.c
rename to confluent_osdeploy/utils/copernicus.c