diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml
index b898679..23573dd 100644
--- a/.gitea/workflows/docker.yml
+++ b/.gitea/workflows/docker.yml
@@ -9,29 +9,48 @@ jobs:
   docker:
     runs-on: [docker, linux, x86_64]
 
-    # Kør hele jobbet i en container med docker-cli
+    # Brug et image med docker-cli; lad runneren selv injicere docker.sock
     container:
-      image: alpine:3.20
-      options: -v /var/run/docker.sock:/var/run/docker.sock
+      image: docker:27-cli
 
     steps:
-      - name: Install git + docker-cli
-        run: |
-          apk add --no-cache git docker-cli
+      - name: Install git
+        run: apk add --no-cache git
 
+      - name: Debug env (optional)
+        run: |
+          echo "GITHUB_SERVER_URL=$GITHUB_SERVER_URL"
+          echo "GITHUB_REPOSITORY=$GITHUB_REPOSITORY"
+
+      # Public checkout
       - name: Checkout (public)
         if: ${{ !secrets.CI_CLONE_TOKEN }}
         run: |
           git clone "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git" .
           git rev-parse --short HEAD
 
+      # Private checkout (brug PAT i secret CI_CLONE_TOKEN)
       - name: Checkout (private)
         if: ${{ secrets.CI_CLONE_TOKEN }}
         run: |
           git clone "https://${{ secrets.CI_CLONE_TOKEN }}@${GITHUB_SERVER_URL#https://}/${GITHUB_REPOSITORY}.git" .
           git rev-parse --short HEAD
 
+      - name: Docker info
+        run: docker version
+
       - name: Build image (amd64)
+        run: docker build -t jottacloud:latest .
+
+      # (Valgfrit) Push til registry – kræver secrets
+      - name: Login & push
+        if: ${{ secrets.REGISTRY && secrets.REGISTRY_USER && secrets.REGISTRY_PASSWORD }}
         run: |
-          docker version
-          docker build -t jottacloud:latest .
+          REG="${{ secrets.REGISTRY }}"
+          IMG="${{ secrets.IMAGE_NAME || 'jottacloud' }}"
+          TAG_SHORT="$(git rev-parse --short HEAD)"
+          docker login "$REG" -u "${{ secrets.REGISTRY_USER }}" -p "${{ secrets.REGISTRY_PASSWORD }}"
+          docker tag jottacloud:latest "$REG/$IMG:latest"
+          docker tag jottacloud:latest "$REG/$IMG:${TAG_SHORT}"
+          docker push "$REG/$IMG:latest"
+          docker push "$REG/$IMG:${TAG_SHORT}"