diff --git a/.github/workflows/build_docker_production.yml b/.github/workflows/build_docker_production.yml
index fa0f7495..5a9eb250 100644
--- a/.github/workflows/build_docker_production.yml
+++ b/.github/workflows/build_docker_production.yml
@@ -5,6 +5,7 @@ concurrency:
   cancel-in-progress: true
 
 on:
+  workflow_dispatch:
   release:
     types: [published]
 
@@ -44,7 +45,7 @@ jobs:
             linux/arm64
           push: true
           tags: |
-            exordelabs/exorde-client:${{ github.event.release.tag_name }}
+            exordelabs/exorde-client:${{ github.event.release.tag_name || env.GITHUB_REF }}
             exordelabs/exorde-client:latest
 
       - name: Send a message to slack if CI has succeeded