diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 14694261a..d1328cc46 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -10,12 +10,23 @@ on:
       - published
 
 jobs:
+  docker-release:
+    if: github.event_name == 'release'
+    concurrency: docker-release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Docker image
+        uses: Icinga/docker-icingadb@master
+        with:
+          dockerhub-token: '${{ secrets.DOCKER_HUB_PERSONAL_TOKEN }}'
+
   docker:
+    if: github.event_name != 'release'
     runs-on: ubuntu-latest
 
     steps:
       - name: Docker image
         uses: Icinga/docker-icingadb@master
-        env:
-          INPUT_TOKEN: '${{ github.token }}'
-          DOCKER_HUB_PASSWORD: '${{ secrets.DOCKER_HUB_PERSONAL_TOKEN }}'
+        with:
+          dockerhub-token: '${{ secrets.DOCKER_HUB_PERSONAL_TOKEN }}'