diff --git a/confluent_osdeploy/rhcos/initramfs/etc/systemd/system/confluent-rootfs.service b/confluent_osdeploy/coreos/initramfs/etc/systemd/system/confluent-rootfs.service
similarity index 100%
rename from confluent_osdeploy/rhcos/initramfs/etc/systemd/system/confluent-rootfs.service
rename to confluent_osdeploy/coreos/initramfs/etc/systemd/system/confluent-rootfs.service
diff --git a/confluent_osdeploy/rhcos/initramfs/opt/confluent/bin/initconfluent.sh b/confluent_osdeploy/coreos/initramfs/opt/confluent/bin/initconfluent.sh
similarity index 100%
rename from confluent_osdeploy/rhcos/initramfs/opt/confluent/bin/initconfluent.sh
rename to confluent_osdeploy/coreos/initramfs/opt/confluent/bin/initconfluent.sh
diff --git a/confluent_osdeploy/rhcos/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh b/confluent_osdeploy/coreos/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh
similarity index 100%
rename from confluent_osdeploy/rhcos/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh
rename to confluent_osdeploy/coreos/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh
diff --git a/confluent_osdeploy/rhcos/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh b/confluent_osdeploy/coreos/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
similarity index 100%
rename from confluent_osdeploy/rhcos/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
rename to confluent_osdeploy/coreos/initramfs/usr/lib/dracut/hooks/pre-pivot/01-confluent.sh
diff --git a/confluent_osdeploy/rhcos/initramfs/usr/lib/systemd/system/confluent-rootfs.service b/confluent_osdeploy/coreos/initramfs/usr/lib/systemd/system/confluent-rootfs.service
similarity index 100%
rename from confluent_osdeploy/rhcos/initramfs/usr/lib/systemd/system/confluent-rootfs.service
rename to confluent_osdeploy/coreos/initramfs/usr/lib/systemd/system/confluent-rootfs.service
diff --git a/confluent_osdeploy/rhcos/profiles/default/initprofile.sh b/confluent_osdeploy/coreos/profiles/default/initprofile.sh
similarity index 100%
rename from confluent_osdeploy/rhcos/profiles/default/initprofile.sh
rename to confluent_osdeploy/coreos/profiles/default/initprofile.sh
diff --git a/confluent_osdeploy/rhcos/profiles/default/profile.yaml b/confluent_osdeploy/coreos/profiles/default/profile.yaml
similarity index 100%
rename from confluent_osdeploy/rhcos/profiles/default/profile.yaml
rename to confluent_osdeploy/coreos/profiles/default/profile.yaml
diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py
index 0f2075d8..2a99c33e 100644
--- a/confluent_server/confluent/osimage.py
+++ b/confluent_server/confluent/osimage.py
@@ -434,9 +434,13 @@ def check_rhcos(isoinfo):
             prodinfo = prodinfo.decode('utf8')
         for inf in prodinfo.split():
             if inf.startswith('coreos.liveiso=rhcos-'):
-                _, ver, _ = inf.split('-')
+                ver = inf.split('-')[1]
                 return {'name': 'rhcos-{0}-{1}'.format(ver, arch),
-                        'method': EXTRACT, 'category': 'rhcos'}
+                        'method': EXTRACT, 'category': 'coreos'}
+            elif inf.startswith('coreos.liveiso=fedore-coreos-'):
+                ver = inf.split('-')[2]
+                return {'name': 'fedoracoreos-{0}-{1}'.format(ver, arch),
+                        'method': EXTRACT, 'category': 'coreos'}