diff --git a/.github/workflows/deploy-hello-world.yaml b/.github/workflows/deploy-hello-world.yaml
index 81b85e4..7c2ba47 100644
--- a/.github/workflows/deploy-hello-world.yaml
+++ b/.github/workflows/deploy-hello-world.yaml
@@ -3,41 +3,45 @@ name: Deploy Hello World
 on:
   push:
     branches:
-      - master
+      - 'master'
     tags:
-      - "v*-hello-world"
+      - 'v*'
   pull_request:
     branches:
       - 'master'
 
 jobs:
-  deploy-docker-hello-world:
+    deploy-docker-hello-world:
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Docker meta
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: git.nicktrimborn.de/nick/dockerbuild_hello_world
-          flavor: latest=true
+          images: |
+            git.nicktrimborn.de/nick/dockerbuild_hello_world
           tags: |
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
-
-      - name: Login to image repository
+            type=semver,pattern={{major}}.{{minor}}
+      -
+        name: Login to DockerHub
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
           registry: git.nicktrimborn.de
           username: ${{ secrets.ACTION_USER }}
           password: ${{ secrets.PASSWORD }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
         with:
-          file: Dockerfile
-          push: true
-          tags: nick/dockerbuild_hello_world:latest
\ No newline at end of file
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}          
\ No newline at end of file