diff --git a/server/src/com/cloud/upgrade/dao/Upgrade218to22.java b/server/src/com/cloud/upgrade/dao/Upgrade218to22.java
index 881c7128edb..aba3a1a79da 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade218to22.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade218to22.java
@@ -1006,6 +1006,11 @@ public class Upgrade218to22 implements DbUpgrade {
                 pstmt.executeUpdate();
                 pstmt.close();
 
+                // Set account=systemAccount and domain=ROOT for CPVM/SSVM
+                pstmt = conn.prepareStatement("UPDATE vm_instance SET account_id=1, domain_id=1 WHERE type='ConsoleProxy' or type='SecondaryStorageVm'");
+                pstmt.executeUpdate();
+                pstmt.close();
+
             }
         } catch (SQLException e) {
             throw new CloudRuntimeException("Can't update data center ", e);