diff --git a/.github/workflows/build-offline.yml b/.github/workflows/build-offline.yml
index 9a7ebffe23..67b8d16717 100644
--- a/.github/workflows/build-offline.yml
+++ b/.github/workflows/build-offline.yml
@@ -105,7 +105,7 @@ jobs:
           image: ghcr.io/openzim/zim-tools:3.1.3
           options: -v ${{ github.workspace }}:/data
           run: |
-            zimwriterfs -w index.html -I assets/brand/logos/png/square/pg-yellow.png -l eng -t "Privacy Guides" -d "Your central privacy and security resource to protect yourself online." -c "Privacy Guides" -p "Jonah Aragon" -n "Privacy Guides" -e "https://github.com/privacyguides/privacyguides.org" /data/site /data/privacy_guides.zim
+            zimwriterfs -w index.html -I assets/brand/logos/png/square/pg-yellow.png -l eng -t "Privacy Guides" -d "Your central privacy and security resource to protect yourself online." -c "Privacy Guides" -p "Jonah Aragon" -n "Privacy Guides" -e "https://github.com/privacyguides/privacyguides.org" /data/site /data/offline-privacy_guides.zim
 
       - name: Upload ZIM file
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 15e2347fbb..9b675602a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,6 +55,7 @@ jobs:
           repository: ${{ inputs.repo }}
           ref: ${{ inputs.ref }}
           persist-credentials: 'false'
+          fetch-depth: 0
 
       - uses: actions/download-artifact@v4
         with:
@@ -106,6 +107,7 @@ jobs:
         with:
           path: includes/strings.${{ inputs.lang }}.env
           export-variables: true
+          keys-case: bypass
 
       - env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/publish-pr.yml b/.github/workflows/publish-pr.yml
index 7721516743..0c24bb87ff 100644
--- a/.github/workflows/publish-pr.yml
+++ b/.github/workflows/publish-pr.yml
@@ -97,5 +97,6 @@ jobs:
           comment_tag: deployment
 
   cleanup:
-    needs: deploy
+    if: ${{ always() }}
+    needs: build
     uses: ./.github/workflows/cleanup.yml
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
new file mode 100644
index 0000000000..abe6f836c9
--- /dev/null
+++ b/.github/workflows/test-build.yml
@@ -0,0 +1,64 @@
+# Copyright (c) 2024 Jonah Aragon <jonah@triplebit.net>
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+name: 📦 Manual Test Build
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  submodule:
+    strategy:
+      matrix:
+        repo: [mkdocs-material-insiders, brand, i18n]
+    uses: ./.github/workflows/download-repo.yml
+    with:
+      repo: ${{ matrix.repo }}
+    secrets:
+      ACTIONS_SSH_KEY: ${{ secrets.ACTIONS_SSH_KEY }}
+
+  build:
+    needs: submodule
+    strategy:
+      matrix:
+        lang: [en, es, fr, he, it, nl, ru, zh-Hant]
+      fail-fast: false
+    permissions:
+      contents: read
+    uses: ./.github/workflows/build.yml
+    with:
+      ref: ${{ github.ref }}
+      repo: ${{ github.repository }}
+      lang: ${{ matrix.lang }}
+      continue-on-error: true
+
+  buildoffline:
+    needs: submodule
+    permissions:
+      contents: read
+    uses: ./.github/workflows/build-offline.yml
+
+  cleanup:
+    if: ${{ always() }}
+    needs: [build, buildoffline]
+    uses: ./.github/workflows/cleanup.yml