diff --git a/pkg/controller/machine-set-boot-image/platform_helpers.go b/pkg/controller/machine-set-boot-image/platform_helpers.go
index 32b8e5e8f0..2090b0d70d 100644
--- a/pkg/controller/machine-set-boot-image/platform_helpers.go
+++ b/pkg/controller/machine-set-boot-image/platform_helpers.go
@@ -86,7 +86,7 @@ func reconcileGCP(machineSet *machinev1beta1.MachineSet, configMap *corev1.Confi
 	patchRequired = false
 	newProviderSpec := providerSpec.DeepCopy()
 	for idx, disk := range newProviderSpec.Disks {
-		if newBootImage != disk.Image {
+		if newBootImage != disk.Image && disk.Boot {
 			klog.Infof("New target boot image: %s", newBootImage)
 			klog.Infof("Current image: %s", disk.Image)
 			patchRequired = true
diff --git a/test/e2e/msbic_test.go b/test/e2e/msbic_test.go
index 03ebce797e..a335e7a500 100644
--- a/test/e2e/msbic_test.go
+++ b/test/e2e/msbic_test.go
@@ -370,7 +370,9 @@ func verifyMachineSet(t *testing.T, cs *framework.ClientSet, ms machinev1beta1.M
 
 	newProviderSpec := providerSpec.DeepCopy()
 	for idx := range newProviderSpec.Disks {
-		newProviderSpec.Disks[idx].Image = newProviderSpec.Disks[idx].Image + "-fake-update"
+		if newProviderSpec.Disks[idx].Boot {
+			newProviderSpec.Disks[idx].Image = newProviderSpec.Disks[idx].Image + "-fake-update"
+		}
 	}
 
 	newMachineSet := ms.DeepCopy()