diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml
index 7596a1f0a..7f747fc15 100644
--- a/.github/workflows/l10n.yml
+++ b/.github/workflows/l10n.yml
@@ -207,8 +207,10 @@ jobs:
         shell: pwsh
       - name: Download Executable
         if: ${{ inputs.win_installer_link }}
+        env:
+          WIN_INSTALLER_LINK: ${{ inputs.win_installer_link }}
         run: |
-          Invoke-WebRequest -Uri ${{ inputs.win_installer_link }} -OutFile "${{ github.workspace }}\setup.exe"
+          Invoke-WebRequest -Uri $WIN_INSTALLER_LINK -OutFile "${{ github.workspace }}\setup.exe"
           New-Item -ItemType Directory -Path "C:\Program Files\Custom Firefox" -Force
         shell: pwsh
       - name: Install Beta
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f41459f3c..93a9899d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,6 +38,7 @@ on:
         type: string
 env:
   FX_CHANNEL: ${{ inputs.channel }}
+  TEST_SET: ${{ inputs.test_set }}
   TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
   TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
   TESTRAIL_USERNAME: ${{ secrets.TESTRAIL_USERNAME }}
@@ -67,12 +68,12 @@ jobs:
       - name: Select Test Set
         if: ${{ inputs.test_set != null }}
         run: |
-          echo "STARFOX_SPLIT=${{ inputs.test_set }}" | Out-File -FilePath .env -Encoding utf8 -Append -Force
+          echo "STARFOX_SPLIT=$TEST_SET" | Out-File -FilePath .env -Encoding utf8 -Append -Force
         shell: pwsh
       - name: Set Functional Split
         if: ${{ inputs.test_set == 'functional' }}
         run: |
-          echo "STARFOX_SPLIT=${{ inputs.test_set }}1" | Out-File -FilePath .env -Encoding utf8 -Append -Force
+          echo "STARFOX_SPLIT=$TEST_SET1" | Out-File -FilePath .env -Encoding utf8 -Append -Force
       - name: Install dependencies
         run: |
           mkdir -p artifacts;
@@ -99,9 +100,11 @@ jobs:
         shell: pwsh
       - name: Download Executable
         if: ${{ inputs.win_installer_link }}
+        env:
+          WIN_INSTALLER_LINK: ${{ inputs.win_installer_link }}
         run: |
           echo "STARFOX_SPLIT=ci-extended" | Out-File -FilePath .env -Encoding utf8 -Append -Force
-          Invoke-WebRequest -Uri ${{ inputs.win_installer_link }} -OutFile "${{ github.workspace }}\setup.exe"
+          Invoke-WebRequest -Uri $WIN_INSTALLER_LINK -OutFile "${{ github.workspace }}\setup.exe"
           New-Item -ItemType Directory -Path "C:\Program Files\Custom Firefox" -Force
         shell: pwsh
       - name: Install Beta
@@ -171,10 +174,10 @@ jobs:
           echo "Running report for most recent Beta on MacOS";
       - name: Select Test Set
         if: ${{ inputs.test_set != null }}
-        run: echo "STARFOX_SPLIT=${{ inputs.test_set }}" >> .env
+        run: echo "STARFOX_SPLIT=$TEST_SET" >> .env
       - name: Set Functional Split
         if: ${{ inputs.test_set == 'functional' }}
-        run: echo "STARFOX_SPLIT=${{ inputs.test_set }}1" >> .env
+        run: echo "STARFOX_SPLIT=$TEST_SET1" >> .env
       - name: Set Environment (Manual)
         if: ${{ inputs.mac_installer_link }}
         run: |