diff --git a/managed/src/main/java/com/yugabyte/yw/common/AppInit.java b/managed/src/main/java/com/yugabyte/yw/common/AppInit.java
index 645c23b1415..d2d402108db 100644
--- a/managed/src/main/java/com/yugabyte/yw/common/AppInit.java
+++ b/managed/src/main/java/com/yugabyte/yw/common/AppInit.java
@@ -210,23 +210,19 @@ public AppInit(
               }
             }
           }
-          if (vmOsPatchingEnabled && defaultYbaOsVersion != null) {
+          if (vmOsPatchingEnabled) {
             String providerCode = provider.getCode();
-            if (defaultYbaOsVersion.containsKey(providerCode)) {
-              Map<String, String> currOSVersionDBMap =
-                  (Map<String, String>) defaultYbaOsVersion.get(providerCode);
-              if (currOSVersionDBMap != null
-                  && currOSVersionDBMap.containsKey("version")
-                  && !currOSVersionDBMap
-                      .get("version")
-                      .equals(CloudImageBundleSetup.CLOUD_OS_MAP.get(providerCode).getVersion())) {
-                // In case defaultYbaAmiVersion is not null & not equal to version specified in
-                // CloudImageBundleSetup.YBA_AMI_VERSION, we will check in the provider bundles
-                // & migrate all the YBA_DEFAULT -> YBA_DEPRECATED, & at the same time generating
-                // new bundle with the latest AMIs. This will only hold in case the provider
-                // does not have CUSTOM bundles.
-                imageBundleUtil.migrateImageBundlesForProviders(provider);
-              }
+            Map<String, String> currOSVersionDBMap = null;
+            if (defaultYbaOsVersion != null && defaultYbaOsVersion.containsKey(providerCode)) {
+              currOSVersionDBMap = (Map<String, String>) defaultYbaOsVersion.get(providerCode);
+            }
+            if (imageBundleUtil.migrateYBADefaultBundles(currOSVersionDBMap, provider)) {
+              // In case defaultYbaAmiVersion is not null & not equal to version specified in
+              // CloudImageBundleSetup.YBA_AMI_VERSION, we will check in the provider bundles
+              // & migrate all the YBA_DEFAULT -> YBA_DEPRECATED, & at the same time generating
+              // new bundle with the latest AMIs. This will only hold in case the provider
+              // does not have CUSTOM bundles.
+              imageBundleUtil.migrateImageBundlesForProviders(provider);
             }
           }
         }
diff --git a/managed/src/main/java/com/yugabyte/yw/common/ImageBundleUtil.java b/managed/src/main/java/com/yugabyte/yw/common/ImageBundleUtil.java
index 4b2dbc9fbc5..0eeaf2fb7be 100644
--- a/managed/src/main/java/com/yugabyte/yw/common/ImageBundleUtil.java
+++ b/managed/src/main/java/com/yugabyte/yw/common/ImageBundleUtil.java
@@ -246,6 +246,35 @@ public void migrateImageBundlesForProviders(Provider provider) {
         enableVMOSPatching);
   }
 
+  public boolean migrateYBADefaultBundles(
+      Map<String, String> currOSVersionDBMap, Provider provider) {
+    String providerCode = provider.getCode();
+    if (currOSVersionDBMap != null
+        && currOSVersionDBMap.containsKey("version")
+        && !currOSVersionDBMap
+            .get("version")
+            .equals(CloudImageBundleSetup.CLOUD_OS_MAP.get(providerCode).getVersion())) {
+      return true;
+    }
+
+    List<ImageBundle> getYbaDefaultImageBundles =
+        ImageBundle.getYBADefaultBundles(provider.getUuid());
+    if (getYbaDefaultImageBundles.size() != 0) {
+      ImageBundle ybaDefaultBundle = getYbaDefaultImageBundles.get(0);
+      if (ybaDefaultBundle.getMetadata() == null
+          || (ybaDefaultBundle.getMetadata() != null
+              && ybaDefaultBundle.getMetadata().getVersion() != null
+              && ybaDefaultBundle.getMetadata().getVersion()
+                  != CloudImageBundleSetup.CLOUD_OS_MAP.get(providerCode).getVersion())) {
+        return true;
+      }
+    } else if (getYbaDefaultImageBundles.size() == 0) {
+      return true;
+    }
+
+    return false;
+  }
+
   public Map<UUID, ImageBundle> collectUniversesImageBundles() {
     Map<UUID, ImageBundle> imageBundleMap = new HashMap<>();
     for (Customer customer : Customer.getAll()) {