diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9fea215..857fdad 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,7 +1,15 @@
 name: Publish Docker image
+
 on:
-  release:
-    types: [published]
+  push:
+    branches:
+      - "master"
+    tags:
+      - "v*"
+  pull_request:
+    branches:
+      - "master"
+
 jobs:
   push_to_registry:
     name: Push Docker image to GitHub Packages
@@ -12,10 +20,15 @@ jobs:
 
       - name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: docker/metadata-action@v3
         with:
           images: ghcr.io/guilhem/rss-issues-action
-          tag-sha: true
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha
 
       - name: Login to DockerHub
         uses: docker/login-action@v1