diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index 2c9fdd3aad..e28fb8111a 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -191,9 +191,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        export TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Build Changelog (Incremental)
       run: |
@@ -1228,9 +1226,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        export TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Run ReleaseNotes Check
       run: dotnet run -c Release --no-build --project tools/Tgstation.Server.ReleaseNotes --winget-template-check ${{ steps.get-sha.outputs.pr_template_sha }}
@@ -1271,9 +1267,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        $Env:TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Parse API version
       shell: powershell
@@ -1336,9 +1330,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        $Env:TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Parse DMAPI version
       shell: powershell
@@ -1400,9 +1392,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        export TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Grab Most Recent Changelog
       run: curl -L https://raw.githubusercontent.com/tgstation/tgstation-server/gh-pages/changelog.yml -o changelog.yml
@@ -1452,9 +1442,7 @@ jobs:
       run: dotnet restore
 
     - name: Build ReleaseNotes
-      run: |
-        export TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
 
     - name: Run ReleaseNotes with --ensure-release
       run: dotnet run -c Release --no-build --project tools/Tgstation.Server.ReleaseNotes --ensure-release
@@ -1724,9 +1712,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Build ReleaseNotes
-      run: |
-        $Env:TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c Release tools/Tgstation.Server.ReleaseNotes
+      run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes
 
     - name: Retrieve Server Service
       uses: actions/download-artifact@v3
diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml
index d5366e8fd4..fdd0e0ecdc 100644
--- a/.github/workflows/code-scanning.yml
+++ b/.github/workflows/code-scanning.yml
@@ -18,6 +18,9 @@ concurrency:
   group: "code-scanning-${{ github.head_ref || github.run_id }}-${{ github.event_name }}"
   cancel-in-progress: true
 
+env:
+  TGS_DOTNET_VERSION: 6.0.x
+
 jobs:
   analyze:
     name: Code Scanning
@@ -28,6 +31,11 @@ jobs:
       security-events: write
     if: ${{ vars.TGS_ENABLE_CODE_QL }} == 'true'
     steps:
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: ${{ env.TGS_DOTNET_VERSION }}
+
     - name: Checkout
       uses: actions/checkout@v3
 
@@ -37,9 +45,7 @@ jobs:
         languages: csharp
 
     - name: Build
-      run: |
-        export TGS_HOST_NO_WEBPANEL=true
-        dotnet build -c ReleaseNoWindows
+      run: dotnet build -c ReleaseNoWindows -p:TGS_HOST_NO_WEBPANEL=true
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
diff --git a/build/package/deb/build_package.sh b/build/package/deb/build_package.sh
index dc653cdea0..626b48e4bb 100755
--- a/build/package/deb/build_package.sh
+++ b/build/package/deb/build_package.sh
@@ -32,9 +32,7 @@ dh_make -p tgstation-server_$TGS_VERSION -y --createorig -s
 rm -f debian/README* debian/changelog debian/*.ex debian/upstream/*.ex
 
 pushd ..
-export TGS_HOST_NO_WEBPANEL=true
-dotnet run -c Release --project tools/Tgstation.Server.ReleaseNotes $TGS_VERSION --debian packaging/debian/changelog $CURRENT_COMMIT
-export TGS_HOST_NO_WEBPANEL=false
+dotnet run -c Release -p:TGS_HOST_NO_WEBPANEL=true --project tools/Tgstation.Server.ReleaseNotes $TGS_VERSION --debian packaging/debian/changelog $CURRENT_COMMIT
 popd
 
 cp -r build/package/deb/debian/* debian/