diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 1bf586a..ddf32d2 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -29,21 +29,28 @@ jobs:
         
       - name: Get Docker tags for Debian based image
         id: docker_meta_debian
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: crazy-max/ghaction-docker-meta@v2
         with:
-          images: nginxproxy/nginx-proxy
-          tag-semver: |
-            {{version}}
-            {{major}}.{{minor}}
+          images: |
+            nginxproxy/nginx-proxy
+            jwilder/nginx-proxy
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
       
       - name: Get Docker tags for Alpine based image
         id: docker_meta_alpine
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: crazy-max/ghaction-docker-meta@v2
         with:
-          images: nginxproxy/nginx-proxy
-          tag-semver: |
-            {{version}}-alpine
-            {{major}}.{{minor}}-alpine
+          images: |
+            nginxproxy/nginx-proxy
+            jwilder/nginx-proxy
+          tags: |
+            type=semver,suffix=-alpine,pattern={{version}}
+            type=semver,suffix=-alpine,pattern={{major}}.{{minor}}
+            type=raw,value=alpine,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
+          flavor: latest=false
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -64,10 +71,8 @@ jobs:
           file: Dockerfile
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
-          tags: |
-            ${{ github.ref != 'refs/heads/master' && steps.docker_meta_debian.outputs.tags || '' }}
-            ${{ github.ref == 'refs/heads/master' && 'nginxproxy/nginx-proxy:latest' || '' }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
+          tags: ${{ steps.docker_meta_debian.outputs.tags }}
+          labels: ${{ steps.docker_meta_debian.outputs.labels }}
 
       - name: Build and push the Alpine based image
         id: docker_build_alpine
@@ -76,10 +81,8 @@ jobs:
           file: Dockerfile.alpine
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
-          tags: |
-            ${{ github.ref != 'refs/heads/master' && steps.docker_meta_alpine.outputs.tags || '' }}
-            ${{ github.ref == 'refs/heads/master' && 'nginxproxy/nginx-proxy:alpine' || '' }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
+          tags: ${{ steps.docker_meta_alpine.outputs.tags }}
+          labels: ${{ steps.docker_meta_alpine.outputs.labels }}
 
       - name: Images digests
         run: |