diff --git a/pkg/database/database.go b/pkg/database/database.go
index 479d05e65fc..6f843cce8ff 100644
--- a/pkg/database/database.go
+++ b/pkg/database/database.go
@@ -14,7 +14,6 @@ import (
 	azcorepolicy "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
 	sdkcosmos "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v2"
-
 	"github.com/sirupsen/logrus"
 	"github.com/ugorji/go/codec"
 
diff --git a/pkg/deploy/upgrade_gateway.go b/pkg/deploy/upgrade_gateway.go
index bd7c35f8820..dbb2d47670b 100644
--- a/pkg/deploy/upgrade_gateway.go
+++ b/pkg/deploy/upgrade_gateway.go
@@ -22,7 +22,7 @@ func (d *deployer) UpgradeGateway(ctx context.Context) error {
 	err := d.gatewayWaitForReadiness(timeoutCtx, gatewayVMSSPrefix+d.version)
 	if err != nil {
 		// delete VMSS since VMSS instances are not healthy
-		if *d.config.Configuration.VMSSCleanupEnabled {
+		if false && *d.config.Configuration.VMSSCleanupEnabled {
 			d.vmssCleaner.RemoveFailedNewScaleset(ctx, d.config.GatewayResourceGroupName, gatewayVMSSPrefix+d.version)
 		}
 		return err
diff --git a/pkg/deploy/upgrade_rp.go b/pkg/deploy/upgrade_rp.go
index d03c474808d..b2a3d3b3623 100644
--- a/pkg/deploy/upgrade_rp.go
+++ b/pkg/deploy/upgrade_rp.go
@@ -22,7 +22,7 @@ func (d *deployer) UpgradeRP(ctx context.Context) error {
 	err := d.rpWaitForReadiness(timeoutCtx, rpVMSSPrefix+d.version)
 	if err != nil {
 		// delete VMSS since VMSS instances are not healthy
-		if *d.config.Configuration.VMSSCleanupEnabled {
+		if false && *d.config.Configuration.VMSSCleanupEnabled {
 			d.vmssCleaner.RemoveFailedNewScaleset(ctx, d.config.RPResourceGroupName, rpVMSSPrefix+d.version)
 		}
 		return err