diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f25d918d..ff3c2b41 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -57,9 +57,3 @@ jobs:
         with:
           category: "/language:${{ matrix.language }}"
           upload: true
-
-      - name: Upload SARIF results
-        if: always()
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: ../results
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 8a3aff54..8991d6f3 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -2,9 +2,22 @@ name: "Master Build, Test & Deploy"
 
 on:
   workflow_dispatch:
+    inputs:
+      nightly:
+        description: "Tag build as nightly"
+        required: false
+        default: "false"
   push:
     branches:
     - master
+  schedule:
+    # Weekly build and publish to keep images fresh
+    - cron: '0 3 * * 1'
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+  PLATFORMS: linux/amd64,linux/arm64
 
 jobs:
   main:
@@ -56,3 +69,57 @@ jobs:
         build_dir: ./build/prod
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  docker-images:
+    name: Build & Publish Docker Images
+    runs-on: ubuntu-latest
+    needs: main
+    if: github.ref == 'refs/heads/master'
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Log in to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Set extra tags
+      run: |
+        if [ "${{ github.event_name }}" = "workflow_dispatch" ] && [ "${{ github.event.inputs.nightly }}" = "true" ]; then
+          echo "EXTRA_TAGS=type=raw,value=nightly" >> $GITHUB_ENV
+        else
+          echo "EXTRA_TAGS=" >> $GITHUB_ENV
+        fi
+
+    - name: Docker metadata
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+        tags: |
+          type=raw,value=latest
+          type=sha,format=long
+          ${{ env.EXTRA_TAGS }}
+
+    - name: Build and push multi-arch image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: ./Dockerfile
+        platforms: ${{ env.PLATFORMS }}
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max