diff --git a/pkg/addons/applier.go b/pkg/addons/applier.go
index 4e9e9d905..ca0cb77eb 100644
--- a/pkg/addons/applier.go
+++ b/pkg/addons/applier.go
@@ -103,7 +103,7 @@ func newAddonsApplier(s *state.State) (*applier, error) {
 		return nil, errors.Wrap(err, "failed to load CA keypair")
 	}
 
-	// We want to be true in two cases:
+	// We want this to be true in two cases:
 	// 	* if the CSI migration is already enabled
 	//	* if we are starting the CCM/CSI migration process
 	csiMigration := s.CCMMigration
diff --git a/pkg/templates/images/images.go b/pkg/templates/images/images.go
index dfda4d9ed..152a0d878 100644
--- a/pkg/templates/images/images.go
+++ b/pkg/templates/images/images.go
@@ -88,7 +88,7 @@ func baseResources() map[Resource]map[string]string {
 		CalicoNode:        {"*": "docker.io/calico/node:v3.19.1"},
 		DNSNodeCache:      {"*": "k8s.gcr.io/k8s-dns-node-cache:1.15.13"},
 		Flannel:           {"*": "quay.io/coreos/flannel:v0.13.0"},
-		MachineController: {"*": "docker.io/kubermatic/machine-controller:v1.35.1"},
+		MachineController: {"*": "docker.io/kubermatic/machine-controller:v1.35.2"},
 		MetricsServer:     {"*": "k8s.gcr.io/metrics-server/metrics-server:v0.5.0"},
 	}
 }
@@ -134,7 +134,11 @@ func optionalResources() map[Resource]map[string]string {
 		PacketCCM: {"*": "docker.io/packethost/packet-ccm:v1.0.0"},
 
 		// vSphere CCM
-		VsphereCCM: {"*": "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.2.1"},
+		VsphereCCM: {
+			"1.19.x":    "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.19.0",
+			"1.20.x":    "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.20.0",
+			">= 1.21.0": "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.21.0",
+		},
 
 		// vSphere CSI
 		VsphereCSIDriver: {"*": "gcr.io/cloud-provider-vsphere/csi/release/driver:v2.3.0"},