diff --git a/pkg/node/kubelet.go b/pkg/node/kubelet.go
index e3abf08924..307b1e9101 100644
--- a/pkg/node/kubelet.go
+++ b/pkg/node/kubelet.go
@@ -70,6 +70,15 @@ func (s *KubeletServer) configure(cfg *config.MicroshiftConfig) {
 	kubeletFlags.NodeIP = cfg.NodeIP
 	kubeletFlags.ContainerRuntime = "remote"
 	kubeletFlags.RemoteRuntimeEndpoint = "unix:///var/run/crio/crio.sock"
+	for _, role := range cfg.Roles {
+		if role == "controlplane" {
+			kubeletFlags.NodeLabels["node-role.kubernetes.io/control-plane"] = ""
+			kubeletFlags.NodeLabels["node-role.kubernetes.io/master"] = ""
+		}
+		if role == "node" {
+			kubeletFlags.NodeLabels["node-role.kubernetes.io/worker"] = ""
+		}
+	}
 
 	kubeletConfig, err := loadConfigFile(cfg.DataDir + "/resources/kubelet/config/config.yaml")