diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgradeSystemVmTemplate.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgradeSystemVmTemplate.java
index 4211898adc7d..a8d2436672e7 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgradeSystemVmTemplate.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgradeSystemVmTemplate.java
@@ -17,9 +17,23 @@
 
 package com.cloud.upgrade.dao;
 
+import com.cloud.upgrade.SystemVmTemplateRegistration;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.sql.Connection;
 
 public interface DbUpgradeSystemVmTemplate {
 
-    void updateSystemVmTemplates(Connection conn);
+    default void updateSystemVmTemplates(Connection conn) {
+        Logger logger = LogManager.getLogger(getClass());
+        logger.debug("Updating System Vm template IDs");
+        try {
+            SystemVmTemplateRegistration systemVmTemplateRegistration = new SystemVmTemplateRegistration("");
+            systemVmTemplateRegistration.updateSystemVmTemplates(conn);
+        } catch (Exception e) {
+            throw new CloudRuntimeException("Failed to find / register SystemVM template(s)");
+        }
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42020to42030.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42020to42030.java
index 68100e164018..e0aa38a717b2 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42020to42030.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42020to42030.java
@@ -57,8 +57,4 @@ public void performDataMigration(Connection conn) {
     public InputStream[] getCleanupScripts() {
         return null;
     }
-
-    @Override
-    public void updateSystemVmTemplates(Connection conn) {
-    }
 }