diff --git a/images/win/scripts/Installers/Install-Wix.ps1 b/images/win/scripts/Installers/Install-Wix.ps1
index 5758cfc73..c5865af80 100644
--- a/images/win/scripts/Installers/Install-Wix.ps1
+++ b/images/win/scripts/Installers/Install-Wix.ps1
@@ -5,23 +5,4 @@
 
 Choco-Install -PackageName wixtoolset -ArgumentList "--force"
 
-if (Test-IsWin19)
-{
-    $extensionUrl = "https://wixtoolset.gallerycdn.vsassets.io/extensions/wixtoolset/wixtoolsetvisualstudio2019extension/1.0.0.4/1563296438961/Votive2019.vsix"
-    $VSver = "2019"
-}
-elseif (Test-IsWin16)
-{
-    $extensionUrl = "https://robmensching.gallerycdn.vsassets.io/extensions/robmensching/wixtoolsetvisualstudio2017extension/0.9.21.62588/1494013210879/250616/4/Votive2017.vsix"
-    $VSver = "2017"
-}
-
-if (-not (Test-IsWin22))
-{
-    $extensionName = "Votive$VSver.vsix"
-
-    #Installing VS extension 'Wix Toolset Visual Studio Extension'
-    Install-VsixExtension -Url $extensionUrl -Name $extensionName -VSversion $VSver
-}
-
 Invoke-PesterTests -TestFile "Wix"
diff --git a/images/win/scripts/Tests/Wix.Tests.ps1 b/images/win/scripts/Tests/Wix.Tests.ps1
index 7b7f7cdae..66937f696 100644
--- a/images/win/scripts/Tests/Wix.Tests.ps1
+++ b/images/win/scripts/Tests/Wix.Tests.ps1
@@ -8,16 +8,4 @@ Describe "Wix" {
     It "Wix Toolset version from registry" {
       $version | Should -Not -BeNullOrEmpty
     }
-
-    It "Wix Toolset version from system" -Skip:(Test-IsWin22) {
-      if (Test-IsWin19)
-      {
-        $exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev16"
-      }
-      else
-      {
-        $exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev15"
-      }
-      $exVersion | Should -Not -BeNullOrEmpty
-    }
 }
diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json
index e937129c3..e8d8a7be1 100644
--- a/images/win/toolsets/toolset-2016.json
+++ b/images/win/toolsets/toolset-2016.json
@@ -343,6 +343,7 @@
             "Microsoft.VisualStudio.Workload.Office"
         ],
         "vsix": [
+            "WixToolset.WixToolsetVisualStudio2017Extension"
         ]
     },
     "docker": {
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index 86fad6a8e..caf928b55 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -377,7 +377,8 @@
             "SSIS.SqlServerIntegrationServicesProjects",
             "ProBITools.MicrosoftReportProjectsforVisualStudio",
             "VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects",
-            "ms-biztalk.BizTalk"
+            "ms-biztalk.BizTalk",
+            "WixToolset.WixToolsetVisualStudio2019Extension"
         ]
     },
     "docker": {
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index 1a73b3f7c..4fedb5e3e 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -247,7 +247,8 @@
             "wasm.tools"
         ],
         "vsix": [
-            "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects"
+            "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects",
+            "WixToolset.WixToolsetVisualStudio2022Extension"
         ]
     },
     "docker": {