diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index aaf51c7d2..8c4a9b239 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -3,19 +3,31 @@ name: Build and Publish Docker Image
 on:
   release:
     types: [published]
+  workflow_dispatch:
 
 jobs:
   build_image:
     runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
     steps:
-      - uses: actions/checkout@v1
-      - uses: docker/build-push-action@v1
-        env:
-          DOCKER_BUILDKIT: 1
+      - uses: actions/checkout@v4
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v3
         with:
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: mindleaps/tracker/mindleaps-tracker
-          build_args: APP_ENV=prod
-          tag_with_ref: true
+
+      - uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: ${{ github.event_name == 'release' }}
+          build-args: |
+            APP_ENV=prod
+          tags: |
+            ghcr.io/mindleaps/tracker/mindleaps-tracker:latest
+            ghcr.io/mindleaps/tracker/mindleaps-tracker:${{ github.event.release.tag_name }}