diff --git a/.gitea/workflows/publish-docker.yaml b/.gitea/workflows/publish-docker.yaml
index ae67f85..16fcf87 100644
--- a/.gitea/workflows/publish-docker.yaml
+++ b/.gitea/workflows/publish-docker.yaml
@@ -1,36 +1,38 @@
-name: Build and Publish drop-in-url-previews
-run-name: Build and Publish drop-in-url-previews
+name: Build and Publish
+run-name: Build and Publish
 on: [push]
 
 jobs:
   build_and_publish:
-    runs-on: ubuntu-latest
+    runs-on: [ubuntu-latest]
     steps:
-      - name: Checkout repository
+      - name: Check out repository code
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to repo
-        uses: docker/login-action@v3
-        with:
-          registry: git.i-am.nexus
-          username: ${{ secrets.CR_USERNAME }}
-          password: ${{ secrets.CR_PASSWORD }}
-      - name: Extract metadata (tags, labels) for Docker
+      - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: git.i-am.nexus/nex/drop-in-url-previews
-      - name: Build
+
+      - name: Log into forgejo CR
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          registry: git.i-am.nexus
+          username: nex
+          password: ${{ secrets.CR_PASSWORD }}
+
+      - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
-          push: false
-          load: true
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-      - name: Push
-        run: |
-          docker push -a git.i-am.nexus/nex/drop-in-url-previews
\ No newline at end of file
+          cache-from: type=registry,ref=git.i-am.nexus/nex/drop-in-url-previews:master
+          cache-to: type=inline