diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index dc23459e04e..2b395216f45 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -15,19 +15,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  docker-release:
-    if: github.event_name == 'release'
-    concurrency: docker-release
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Docker image
-        uses: Icinga/docker-icinga2@master
-        with:
-          dockerhub-token: '${{ secrets.DOCKER_HUB_PERSONAL_TOKEN }}'
-
   docker:
-    if: github.event_name != 'release'
+    concurrency: docker-${{ github.event_name == 'release' && 'release' || github.ref }}
     runs-on: ubuntu-latest
 
     steps: