diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index c04f4adb8..72fb176f3 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -22,9 +22,6 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Install WDK VSIX
-        run: .\.github\scripts\Install-Vsix.ps1
-
       - name: Install Nuget Packages
         run: nuget restore .\packages.config -PackagesDirectory .\packages\
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c35a81ec1..11dee203e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,9 +22,6 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Install WDK VSIX
-        run: .\.github\scripts\Install-Vsix.ps1
-
       - name: Install Nuget Packages
         run: nuget restore .\packages.config -PackagesDirectory .\packages\
 
diff --git a/Build-SampleSet.ps1 b/Build-SampleSet.ps1
index adae8bb06..1844934d7 100644
--- a/Build-SampleSet.ps1
+++ b/Build-SampleSet.ps1
@@ -61,15 +61,13 @@ finally {
 $build_environment=""
 $build_number=0
 $nuget_package_version=0
-$vsix_version=""
 #
-# In Github we build using NuGet and get the version from packages and vsix version from env var set from the install vsix step.
+# In Github we build using NuGet.
 #
 if ($env:GITHUB_REPOSITORY) {
     $build_environment="GitHub"
     $nuget_package_version=([regex]'(?<=x64\.)(\d+\.)(\d+\.)(\d+\.)(\d+)').Matches((Get-Childitem .\packages\*WDK.x64* -Name)).Value
     $build_number=$nuget_package_version.split('.')[2]
-    $vsix_version = $env:SAMPLES_VSIX_VERSION
 }
 #
 # WDK NuGet will require presence of a folder 'packages'. The version is sourced from repo .\Env-Vars.ps1.
@@ -107,16 +105,14 @@ else {
     exit 1
 }
 #
-# Get the vsix version from packages if not set
-if (-not $vsix_version) {
-    $vsix_version = ls "${env:ProgramData}\Microsoft\VisualStudio\Packages\Microsoft.Windows.DriverKit,version=*" | Select -ExpandProperty Name
-    if ($vsix_version) {
-        $vsix_version = $vsix_version.split('=')[1]
-    }
-    else {
-        Write-Error "No version of the WDK VSIX could be found. The WDK VSIX is not installed."
-        exit 1
-    }
+# Get the vsix version from packages
+$vsix_version = ls "${env:ProgramData}\Microsoft\VisualStudio\Packages\Microsoft.Windows.DriverKit,version=*" | Select -ExpandProperty Name
+if ($vsix_version) {
+    $vsix_version = ($vsix_version.split('=')[1]).split(',machinearch')
+}
+else {
+    Write-Error "No version of the WDK VSIX could be found. The WDK VSIX is not installed."
+    exit 1
 }
 #
 #