diff --git a/data/data/bootstrap/systemd/units/approve-csr.service b/data/data/bootstrap/systemd/common/units/approve-csr.service
similarity index 100%
rename from data/data/bootstrap/systemd/units/approve-csr.service
rename to data/data/bootstrap/systemd/common/units/approve-csr.service
diff --git a/data/data/bootstrap/systemd/units/bootkube.service b/data/data/bootstrap/systemd/common/units/bootkube.service
similarity index 100%
rename from data/data/bootstrap/systemd/units/bootkube.service
rename to data/data/bootstrap/systemd/common/units/bootkube.service
diff --git a/data/data/bootstrap/systemd/units/crio-configure.service.template b/data/data/bootstrap/systemd/common/units/crio-configure.service.template
similarity index 100%
rename from data/data/bootstrap/systemd/units/crio-configure.service.template
rename to data/data/bootstrap/systemd/common/units/crio-configure.service.template
diff --git a/data/data/bootstrap/systemd/units/kubelet.service.template b/data/data/bootstrap/systemd/common/units/kubelet.service.template
similarity index 100%
rename from data/data/bootstrap/systemd/units/kubelet.service.template
rename to data/data/bootstrap/systemd/common/units/kubelet.service.template
diff --git a/data/data/bootstrap/systemd/units/progress.service b/data/data/bootstrap/systemd/common/units/progress.service
similarity index 100%
rename from data/data/bootstrap/systemd/units/progress.service
rename to data/data/bootstrap/systemd/common/units/progress.service
diff --git a/data/data/bootstrap/systemd/units/release-image-pivot.service.template b/data/data/bootstrap/systemd/common/units/release-image-pivot.service.template
similarity index 100%
rename from data/data/bootstrap/systemd/units/release-image-pivot.service.template
rename to data/data/bootstrap/systemd/common/units/release-image-pivot.service.template
diff --git a/data/data/bootstrap/systemd/units/release-image.service b/data/data/bootstrap/systemd/common/units/release-image.service
similarity index 100%
rename from data/data/bootstrap/systemd/units/release-image.service
rename to data/data/bootstrap/systemd/common/units/release-image.service
diff --git a/data/data/bootstrap/systemd/units/systemd-journal-gatewayd.service.d/certs.conf b/data/data/bootstrap/systemd/common/units/systemd-journal-gatewayd.service.d/certs.conf
similarity index 100%
rename from data/data/bootstrap/systemd/units/systemd-journal-gatewayd.service.d/certs.conf
rename to data/data/bootstrap/systemd/common/units/systemd-journal-gatewayd.service.d/certs.conf
diff --git a/data/data/bootstrap/systemd/units/zincati.service.d/okd-machine-os-disabled.conf b/data/data/bootstrap/systemd/common/units/zincati.service.d/okd-machine-os-disabled.conf
similarity index 100%
rename from data/data/bootstrap/systemd/units/zincati.service.d/okd-machine-os-disabled.conf
rename to data/data/bootstrap/systemd/common/units/zincati.service.d/okd-machine-os-disabled.conf
diff --git a/data/data/bootstrap/systemd/units/chown-gatewayd-key.service b/data/data/bootstrap/systemd/rhcos/units/chown-gatewayd-key.service
similarity index 100%
rename from data/data/bootstrap/systemd/units/chown-gatewayd-key.service
rename to data/data/bootstrap/systemd/rhcos/units/chown-gatewayd-key.service
diff --git a/data/data/bootstrap/systemd/units/systemd-journal-gatewayd.socket b/data/data/bootstrap/systemd/rhcos/units/systemd-journal-gatewayd.socket
similarity index 100%
rename from data/data/bootstrap/systemd/units/systemd-journal-gatewayd.socket
rename to data/data/bootstrap/systemd/rhcos/units/systemd-journal-gatewayd.socket
diff --git a/pkg/asset/ignition/bootstrap/common.go b/pkg/asset/ignition/bootstrap/common.go
index c3db2392fc8..786b78d1264 100644
--- a/pkg/asset/ignition/bootstrap/common.go
+++ b/pkg/asset/ignition/bootstrap/common.go
@@ -50,8 +50,6 @@ var (
 	commonEnabledServices = []string{
 		"progress.service",
 		"kubelet.service",
-		"chown-gatewayd-key.service",
-		"systemd-journal-gatewayd.socket",
 		"approve-csr.service",
 		// baremetal & openstack platform services
 		"keepalived.service",
@@ -59,6 +57,11 @@ var (
 		"ironic.service",
 		"master-bmh-update.service",
 	}
+
+	rhcosEnabledServices = []string{
+		"chown-gatewayd-key.service",
+		"systemd-journal-gatewayd.socket",
+	}
 )
 
 // bootstrapTemplateData is the data to use to replace values in bootstrap
@@ -174,9 +177,14 @@ func (a *Common) generateConfig(dependencies asset.Parents, templateData *bootst
 	if err := AddStorageFiles(a.Config, "/", "bootstrap/files", templateData); err != nil {
 		return err
 	}
-	if err := AddSystemdUnits(a.Config, "bootstrap/systemd/units", templateData, commonEnabledServices); err != nil {
+	if err := AddSystemdUnits(a.Config, "bootstrap/systemd/common/units", templateData, commonEnabledServices); err != nil {
 		return err
 	}
+	if !templateData.IsOKD {
+		if err := AddSystemdUnits(a.Config, "bootstrap/systemd/rhcos/units", templateData, rhcosEnabledServices); err != nil {
+			return err
+		}
+	}
 
 	// Check for optional platform specific files/units
 	platform := installConfig.Config.Platform.Name()