diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json
index 3c12ab02..af87f5e8 100644
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -132,16 +132,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
-            ]
-        },
-        {
-            "type": "windows-restart",
-            "restart_timeout": "30m"
-        },
-        {
-            "type": "powershell",
-            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1"
             ]
         },
@@ -163,18 +154,8 @@
                 "IMAGEDATA_FILE={{user `imagedata_file`}}"
             ],
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Docker.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Docker.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1"
             ]
         },
@@ -198,7 +179,9 @@
                 "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
             ],
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-VS.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-VS.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-NET48.ps1",
+                "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1"
             ],
             "elevated_user": "{{user `install_user`}}",
             "elevated_password": "{{user `install_password`}}"
@@ -206,49 +189,8 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1"
-            ]
-        },
-        {
-            "type": "windows-restart",
-            "restart_timeout": "30m"
-        },
-        {
-            "type": "powershell",
-            "valid_exit_codes": [
-                0,
-                3010
-            ],
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1"
-            ],
-            "elevated_user": "{{user `install_user`}}",
-            "elevated_password": "{{user `install_password`}}",
-            "pause_before": "120s"
-        },
-        {
-            "type": "windows-restart",
-            "restart_timeout": "30m"
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Wix.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "valid_exit_codes": [
-                0,
-                3010
-            ],
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-NET48.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Wix.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-WDK.ps1"
             ]
         },
@@ -266,161 +208,50 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-7zip.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1"
-            ]
-        },
-          {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Packer.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-7zip.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Packer.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1"
             ]
         },
         {
             "type": "powershell",
             "environment_vars":[
                 "GITHUB_FEED_TOKEN={{ user `github_feed_token` }}",
-                "ROOT_FOLDER={{user `root_folder`}}"
-            ],
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "environment_vars":[
                 "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
                 "ROOT_FOLDER={{user `root_folder`}}"
             ],
             "scripts":[
+                "{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-YAMLLint.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Perl.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Git.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-PHP.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Rust.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Julia.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Svn.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Edge.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-YAMLLint.ps1",
+                "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1"
             ]
         },
         {
             "type": "powershell",
             "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Perl.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Git.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-PHP.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Rust.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Julia.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Svn.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Edge.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1"
             ]
         },
@@ -432,75 +263,6 @@
             "elevated_user": "{{user `install_user`}}",
             "elevated_password": "{{user `install_password`}}"
         },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-R.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AWS.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "environment_vars":[
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1"
-            ]
-        },
         {
             "type": "windows-shell",
             "inline": ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"]
@@ -515,6 +277,21 @@
                 "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-R.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AWS.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1"
+            ]
+        },
+
         {
             "type": "powershell",
             "elevated_user": "SYSTEM",
@@ -526,115 +303,26 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-TypeScript.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Stack.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Jq.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-CloudFoundryCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-KubernetesCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Kind.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-TypeScript.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Stack.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Jq.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-CloudFoundryCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-KubernetesCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Kind.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1"
             ]
         },
-        {
-            "type": "windows-restart",
-            "restart_timeout": "30m"
-        },
         {
             "type": "powershell",
             "scripts":[
@@ -696,12 +384,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1",
                 "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1"
             ]
         },
diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index c0bee987..85c72206 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -140,23 +140,10 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
-            ]
-        },
-        {
-            "type": "windows-restart",
-            "restart_timeout": "10m"
-        },
-        {
-            "type": "powershell",
-            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1"
             ]
         },
-        {
-            "type": "windows-restart",
-            "restart_timeout": "10m"
-        },
         {
             "type": "powershell",
             "inline": [
@@ -164,6 +151,10 @@
               "setx ImageOS {{user `image_os` }} /m"
             ]
         },
+        {
+            "type": "windows-restart",
+            "restart_timeout": "10m"
+        },
         {
             "type": "powershell",
             "environment_vars": [
@@ -171,18 +162,8 @@
                 "IMAGEDATA_FILE={{user `imagedata_file`}}"
             ],
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Docker.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Docker.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1"
             ]
         },
@@ -206,7 +187,8 @@
                 "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
             ],
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-VS.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-VS.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-NET48.ps1"
             ],
             "elevated_user": "{{user `install_user`}}",
             "elevated_password": "{{user `install_password`}}"
@@ -214,35 +196,17 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Wix.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Windows2019/Install-SSDTExtensions.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "valid_exit_codes": [
-                0,
-                3010
-            ],
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-NET48.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Install-WDK.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Wix.ps1",
+                "{{ template_dir }}/scripts/Installers/Windows2019/Install-SSDTExtensions.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-WDK.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-7zip.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Packer.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1"
             ]
         },
         {
@@ -256,42 +220,6 @@
             "type": "windows-restart",
             "restart_timeout": "10m"
         },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-7zip.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Packer.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "environment_vars":[
@@ -302,100 +230,43 @@
                 "{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1"
             ]
         },
+        {
+            "type": "windows-shell",
+            "inline": ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"]
+        },
         {
             "type": "powershell",
             "environment_vars":[
                 "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
-                "ROOT_FOLDER={{user `root_folder`}}"
+                "ROOT_FOLDER={{user `root_folder`}}",
+                "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
             ],
             "scripts":[
                 "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-YAMLLint.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Perl.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Git.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1"
-            ]
-        },
-         {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-PHP.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Rust.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Julia.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Svn.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Edge.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-YAMLLint.ps1",
+                "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1"
+
             ]
         },
         {
             "type": "powershell",
             "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Perl.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Git.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-PHP.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Rust.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Julia.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Svn.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Edge.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1"
             ]
         },
@@ -407,89 +278,6 @@
             "elevated_user": "{{user `install_user`}}",
             "elevated_password": "{{user `install_password`}}"
         },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-R.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AWS.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "environment_vars":[
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1"
-            ]
-        },
-        {
-            "type": "windows-shell",
-            "inline": ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"]
-        },
-        {
-            "type": "powershell",
-            "environment_vars":[
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
-                "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
-            ],
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "elevated_user": "SYSTEM",
@@ -501,139 +289,39 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-TypeScript.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Stack.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Jq.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-CloudFoundryCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-KubernetesCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Kind.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-R.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AWS.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-TypeScript.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Stack.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Jq.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-CloudFoundryCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-KubernetesCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Kind.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1"
             ]
         },
-        {
-            "type": "windows-restart",
-            "restart_timeout": "10m"
-        },
         {
             "type": "powershell",
             "scripts":[