diff --git a/.github/workflows/release-container-image.yml b/.github/workflows/release-container-image.yml
index 2e40902..7e0f7d1 100644
--- a/.github/workflows/release-container-image.yml
+++ b/.github/workflows/release-container-image.yml
@@ -2,9 +2,16 @@ name: release-container-image
 
 on:
   push:
+    branches:
+      - master
     tags:
       - '[0-9]+.[0-9]+.[0-9]+*'
   workflow_dispatch: # Manual Trigger
+    inputs:
+      docker_tag:
+        description: 'Docker tag to use'
+        required: true
+        default: 'dev'
 
 jobs:
   docker:
@@ -21,10 +28,22 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+      
+      - name: Get the tag
+        run: |
+          TAG=${{ github.ref_name }}
+          if [[ $TAG == "master" ]]; then
+            TAG=latest
+          fi
+          MANUAL_WORKFLOW_TAG=${{ inputs.docker_tag }}
+          if [[ $MANUAL_WORKFLOW_TAG != "" ]]; then
+            TAG=${{ inputs.docker_tag }}
+          fi
+          echo "Using tag $TAG"
 
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: docker.io/datastax/pulsar-admin-console:${{  github.ref_name }}
+          tags: docker.io/datastax/pulsar-admin-console:$TAG