diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml
index 62fc92ae6..e3b0f4b17 100644
--- a/.github/workflows/docker_release.yml
+++ b/.github/workflows/docker_release.yml
@@ -1,13 +1,12 @@
 name: Docker image release
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
-  workflow_run:
-    workflows: [Project release on PyPi]
-    types:
-      - completed
+    tags:
+      - "v[0-9].[0-9]+.[0-9]+*"
 
 env:
   DOCKER_REPO_NAME: deepset/haystack
@@ -15,8 +14,6 @@ env:
 jobs:
   build-and-push:
     name: Build ${{ matrix.target }} image for ${{ matrix.platform }}
-    # We need this to run only when we're merging in main or the PyPi release was successful
-    if: ${{ github.event_name == 'push' || github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
diff --git a/.github/workflows/pypi_release.yml b/.github/workflows/pypi_release.yml
index 8025439f8..62b10f076 100644
--- a/.github/workflows/pypi_release.yml
+++ b/.github/workflows/pypi_release.yml
@@ -1,4 +1,3 @@
-# If you change this name also do it in docker_release.yml
 name: Project release on PyPi
 
 on: