diff --git a/.github/workflows/build-mq-broker.yml b/.github/workflows/build-mq-broker.yml
index 4de861dbcd..fdfd3ce2b7 100644
--- a/.github/workflows/build-mq-broker.yml
+++ b/.github/workflows/build-mq-broker.yml
@@ -28,7 +28,7 @@ jobs:
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
-    
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
@@ -48,7 +48,8 @@ jobs:
         file: dev/mq/Dockerfile
         platforms: linux/amd64,linux/arm64
         push: true
-        build-args: RABBITMQ_VERSION=${{ inputs.rabbitmq_version }}
+        build-args: |
+          RABBITMQ_VERSION=${{ inputs.rabbitmq_version || '3.13-alpine' }}
         tags: |
-          ghcr.io/ietf-tools/datatracker-mq:${{ inputs.rabbitmq_version }}
-          ghcr.io/ietf-tools/datatracker-mq:latest
+          ghcr.io/milanhe92/datatracker-mq:${{ inputs.rabbitmq_version || '3.13-alpine' }}
+          ghcr.io/milanhe92/datatracker-mq:latest
\ No newline at end of file