diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml
index b5b7914..f88179d 100644
--- a/.forgejo/workflows/workflow.yaml
+++ b/.forgejo/workflows/workflow.yaml
@@ -24,17 +24,31 @@ jobs:
       - name: Testing..
         run: |
           echo "No Testing to do currently.."
-      - name: Build image
-        run: |
-          podman build -t notatio .
-  Push-Image:
-    runs-on: website
-    steps:
-      - name: Push image to registry
-        run: |
-          podman login -u ${{ secrets.USERNAME }} -p ${{ secrets.PASSWORD }} docker.io
-          podman push notatio ${{ env.registry }}:${{ env.TAG }}
-          podman logout ${{ env.registry }}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            notatio/notatio
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+      - name: Login to Docker Hub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
 Cleanup:
   runs-on: website
   steps: