diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json
index e612645b..e9ec9116 100644
--- a/images/win/toolsets/toolset-2016.json
+++ b/images/win/toolsets/toolset-2016.json
@@ -248,8 +248,7 @@
         "versions": [
             "1.1",
             "2.1",
-            "3.1",
-            "5.0"
+            "3.1"
         ]
     }
 }
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index 94e0f93c..2b226ab7 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -290,8 +290,7 @@
     "dotnet": {
         "versions": [
             "2.1",
-            "3.1",
-            "5.0"
+            "3.1"
         ]
     }
 }
diff --git a/images/win/windows2016.json b/images/win/windows2016.json
index 120e7ac9..13cdc4a7 100644
--- a/images/win/windows2016.json
+++ b/images/win/windows2016.json
@@ -285,6 +285,9 @@
         },
         {
             "type": "powershell",
+            "environment_vars": [
+                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
+            ],
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1",
diff --git a/images/win/windows2019.json b/images/win/windows2019.json
index a27bf27d..f2c230bf 100644
--- a/images/win/windows2019.json
+++ b/images/win/windows2019.json
@@ -292,6 +292,9 @@
         },
         {
             "type": "powershell",
+            "environment_vars": [
+                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
+            ],
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1",