diff --git a/.github/workflows/build-boost-packages.yml b/.github/workflows/build-boost-packages.yml
index c82fb7c..a0ca340 100644
--- a/.github/workflows/build-boost-packages.yml
+++ b/.github/workflows/build-boost-packages.yml
@@ -105,7 +105,13 @@ jobs:
     - name: Extract files
       run: |
           $artifactName = "${{ env.ARTIFACT_NAME }}.tar.gz"
-          tar -xzf $artifactName
+          If ("${{ matrix.platform }}" -eq "win32") {
+            $assetTarPath = $artifactName.TrimEnd(".tar.gz")
+            7z x $artifactName -o"$assetTarPath" -y | Out-Null
+            7z x $assetTarPath -y | Out-Null
+          } else {
+            tar -xzf $artifactName
+          }
       working-directory: ${{ runner.temp }}/${{ env.ARTIFACT_NAME }}
 
     - name: Apply build artifact to the local machine
@@ -115,14 +121,8 @@ jobs:
 
     - name: Setup BOOST_ROOT ${{ github.event.inputs.VERSION }}
       run: |
-        $targetPath = $env:AGENT_TOOLSDIRECTORY
-        if ([string]::IsNullOrEmpty($targetPath)) {
-            # GitHub Windows images don't have `AGENT_TOOLSDIRECTORY` variable
-            $targetPath = $env:RUNNER_TOOL_CACHE
-        }
-        $BoostToolcachePath = Join-Path -Path $targetPath -ChildPath "boost"
-        $BoostToolcacheVersionPath = Join-Path -Path $BoostToolcachePath -ChildPath "${{ github.event.inputs.VERSION }}"
-        $boostDirectory = Join-Path $BoostToolcacheVersionPath "${{ matrix.architecture }}"
+        Import-Module (Join-Path $env:GITHUB_WORKSPACE "helpers" | Join-Path -ChildPath "common-helpers.psm1") -DisableNameChecking
+        $boostDirectory = GetToolDirectory -ToolName "boost" -Version "${{ github.event.inputs.VERSION }}" -Architecture "${{ matrix.architecture }}"
         $LD_LIBRARY = Join-Path -Path $boostDirectory -ChildPath "lib"
         Write-Host "BOOST_ROOT = ${boostDirectory}"
         echo "::set-env name=BOOST_ROOT::${boostDirectory}"
@@ -188,4 +188,4 @@ jobs:
             repo: context.repo.repo,
             workflow_id: 'create-pr.yml',
             ref: 'main'
-          });
+          });
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 20cc120..098d979 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "helpers"]
 	path = helpers
 	url = https://github.com/actions/versions-package-tools
-	branch = v-nibyko/test-branch
+	branch = v-nibyko/boost
diff --git a/helpers b/helpers
index 9fd8fba..eb3ed37 160000
--- a/helpers
+++ b/helpers
@@ -1 +1 @@
-Subproject commit 9fd8fba93dc1cf5320d8bdea79afa7d4057c4a6f
+Subproject commit eb3ed375cc2d6229b8cf00683dd9493f21cc2296