diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service
index 2471578274..e8bf8c1d87 100644
--- a/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service
@@ -8,6 +8,7 @@ contents: |
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
   EnvironmentFile=/etc/os-release
+  EnvironmentFile=/run/kubelet-rhelmajor
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
 
@@ -20,7 +21,7 @@ contents: |
         --container-runtime=remote \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --allow-privileged \
-        --node-labels=node-role.kubernetes.io/master,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/master,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider=aws \
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service
index 0cd5b0cefe..9d8f389b31 100644
--- a/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service
@@ -8,6 +8,7 @@ contents: |
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
   EnvironmentFile=/etc/os-release
+  EnvironmentFile=/run/kubelet-rhelmajor
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
 
@@ -20,7 +21,7 @@ contents: |
         --container-runtime=remote \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --allow-privileged \
-        --node-labels=node-role.kubernetes.io/master,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/master,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider= \
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service
index 0cd5b0cefe..9d8f389b31 100644
--- a/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service
@@ -8,6 +8,7 @@ contents: |
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
   EnvironmentFile=/etc/os-release
+  EnvironmentFile=/run/kubelet-rhelmajor
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
 
@@ -20,7 +21,7 @@ contents: |
         --container-runtime=remote \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --allow-privileged \
-        --node-labels=node-role.kubernetes.io/master,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/master,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider= \
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/openstack/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/openstack/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/openstack/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/vpshere/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vpshere/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vpshere/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service
index f72424dcbd..3fb1f02bac 100644
--- a/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service
@@ -8,6 +8,7 @@ contents: |
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
   EnvironmentFile=/etc/os-release
+  EnvironmentFile=/run/kubelet-rhelmajor
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
 
@@ -20,7 +21,7 @@ contents: |
         --container-runtime=remote \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --allow-privileged \
-        --node-labels=node-role.kubernetes.io/master,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/master,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider=vsphere \
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service
index 8179a7fe72..f90d0256b9 100644
--- a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service
@@ -8,6 +8,7 @@ contents: |
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
   EnvironmentFile=/etc/os-release
+  EnvironmentFile=/run/kubelet-rhelmajor
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
 
@@ -19,7 +20,7 @@ contents: |
         --container-runtime=remote \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --allow-privileged \
-        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
         --minimum-container-ttl-duration=6m0s \
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service
index 65c153df5b..f102708d88 100644
--- a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service
@@ -8,6 +8,7 @@ contents: |
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
   EnvironmentFile=/etc/os-release
+  EnvironmentFile=/run/kubelet-rhelmajor
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
 
@@ -19,7 +20,7 @@ contents: |
         --container-runtime=remote \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --allow-privileged \
-        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
         --minimum-container-ttl-duration=6m0s \
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service
index 65c153df5b..f102708d88 100644
--- a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service
@@ -8,6 +8,7 @@ contents: |
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
   EnvironmentFile=/etc/os-release
+  EnvironmentFile=/run/kubelet-rhelmajor
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
 
@@ -19,7 +20,7 @@ contents: |
         --container-runtime=remote \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --allow-privileged \
-        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
         --minimum-container-ttl-duration=6m0s \
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/openstack/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/openstack/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/openstack/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vpshere/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vpshere/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vpshere/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet-rhelmajor.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet-rhelmajor.service
new file mode 100644
index 0000000000..7b87a1f6ce
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet-rhelmajor.service
@@ -0,0 +1,16 @@
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
+enabled: true
+name: kubelet-rhelmajor.service
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service
index 5990f7ea21..eef8259072 100644
--- a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service
@@ -8,6 +8,7 @@ contents: |
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
   EnvironmentFile=/etc/os-release
+  EnvironmentFile=/run/kubelet-rhelmajor
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
 
@@ -19,7 +20,7 @@ contents: |
         --container-runtime=remote \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --allow-privileged \
-        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
         --minimum-container-ttl-duration=6m0s \
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
diff --git a/templates/master/01-master-kubelet/_base/units/kubelet-rhelmajor.yaml b/templates/master/01-master-kubelet/_base/units/kubelet-rhelmajor.yaml
new file mode 100644
index 0000000000..18dca9f298
--- /dev/null
+++ b/templates/master/01-master-kubelet/_base/units/kubelet-rhelmajor.yaml
@@ -0,0 +1,16 @@
+name: "kubelet-rhelmajor.service"
+enabled: true
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
diff --git a/templates/master/01-master-kubelet/_base/units/kubelet.yaml b/templates/master/01-master-kubelet/_base/units/kubelet.yaml
index 078e86daf8..d88cc0bb40 100644
--- a/templates/master/01-master-kubelet/_base/units/kubelet.yaml
+++ b/templates/master/01-master-kubelet/_base/units/kubelet.yaml
@@ -10,6 +10,7 @@ contents: |
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
   EnvironmentFile=/etc/os-release
+  EnvironmentFile=/run/kubelet-rhelmajor
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
 
@@ -22,7 +23,7 @@ contents: |
         --container-runtime=remote \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --allow-privileged \
-        --node-labels=node-role.kubernetes.io/master,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/master,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider={{cloudProvider .}} \
diff --git a/templates/worker/01-worker-kubelet/_base/units/kubelet-rhelmajor.yaml b/templates/worker/01-worker-kubelet/_base/units/kubelet-rhelmajor.yaml
new file mode 100644
index 0000000000..18dca9f298
--- /dev/null
+++ b/templates/worker/01-worker-kubelet/_base/units/kubelet-rhelmajor.yaml
@@ -0,0 +1,16 @@
+name: "kubelet-rhelmajor.service"
+enabled: true
+contents: |
+  [Unit]
+  Description=Generate rhelmajor version for kubelet
+  Before=kubelet.service
+
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  EnvironmentFile=/etc/os-release
+  # Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
+  ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'
+
+  [Install]
+  WantedBy=multi-user.target
diff --git a/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml b/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml
index 15c71b30ed..c930b11c61 100644
--- a/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml
+++ b/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml
@@ -10,6 +10,7 @@ contents: |
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
   EnvironmentFile=/etc/os-release
+  EnvironmentFile=/run/kubelet-rhelmajor
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
 
@@ -21,7 +22,7 @@ contents: |
         --container-runtime=remote \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --allow-privileged \
-        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
         --minimum-container-ttl-duration=6m0s \
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \