diff --git a/.github/workflows/build-mq-broker.yml b/.github/workflows/build-mq-broker.yml
index 9aaa041cb..6b00eef25 100644
--- a/.github/workflows/build-mq-broker.yml
+++ b/.github/workflows/build-mq-broker.yml
@@ -10,6 +10,9 @@ on:
 
   workflow_dispatch: 
 
+env:
+  RABBITMQ_VERSION: 3.11-alpine
+
 jobs:
   publish:
     runs-on: ubuntu-latest
@@ -40,5 +43,7 @@ jobs:
         file: dev/mq/Dockerfile
         platforms: linux/amd64,linux/arm64
         push: true
-        tags: ghcr.io/ietf-tools/datatracker-mq:latest
-
+        build-args: RABBITMQ_VERSION=${{ env.RABBITMQ_VERSION }}
+        tags: |
+          ghcr.io/ietf-tools/datatracker-mq:${{ env.RABBITMQ_VERSION }}
+          ghcr.io/ietf-tools/datatracker-mq:latest
diff --git a/dev/mq/Dockerfile b/dev/mq/Dockerfile
index e8871c30a..1738c4b3d 100644
--- a/dev/mq/Dockerfile
+++ b/dev/mq/Dockerfile
@@ -1,6 +1,8 @@
 # Dockerfile for RabbitMQ worker
 #
-FROM rabbitmq:3-alpine
+ARG RABBITMQ_VERSION=3.11-alpine
+
+FROM rabbitmq:${RABBITMQ_VERSION}
 LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
 
 # Copy the startup file