diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json
index 442218d3..8d47c462 100644
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -235,14 +235,6 @@
                 "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "elevated_user": "SYSTEM",
-            "elevated_password": "",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "scripts":[
@@ -270,6 +262,14 @@
             "elevated_user": "{{user `install_user`}}",
             "elevated_password": "{{user `install_password`}}"
         },
+        {
+            "type": "powershell",
+            "elevated_user": "SYSTEM",
+            "elevated_password": "",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1"
+            ]
+        },
         {
             "type": "windows-shell",
             "inline": ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"]
diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index 0e3d180b..b1500edb 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -249,14 +249,6 @@
 
             ]
         },
-        {
-            "type": "powershell",
-            "elevated_user": "SYSTEM",
-            "elevated_password": "",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "scripts":[
@@ -284,6 +276,14 @@
             "elevated_user": "{{user `install_user`}}",
             "elevated_password": "{{user `install_password`}}"
         },
+        {
+            "type": "powershell",
+            "elevated_user": "SYSTEM",
+            "elevated_password": "",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[