diff --git a/pkg/controller/machine-set-boot-image/platform_helpers.go b/pkg/controller/machine-set-boot-image/platform_helpers.go
index 039d513d31..2184105110 100644
--- a/pkg/controller/machine-set-boot-image/platform_helpers.go
+++ b/pkg/controller/machine-set-boot-image/platform_helpers.go
@@ -40,7 +40,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 ef0f1c96a9..4482f07990 100644
--- a/test/e2e/msbic_test.go
+++ b/test/e2e/msbic_test.go
@@ -244,7 +244,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"
+		}
 	}
 	newProviderSpec.UserDataSecret.Name = newProviderSpec.UserDataSecret.Name + "-fake-update"