diff --git a/helm/settings_local.py b/helm/settings_local.py
index b07b559c4..26d8ca8e0 100644
--- a/helm/settings_local.py
+++ b/helm/settings_local.py
@@ -18,7 +18,11 @@ DATABASES = {
 
 SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY")
 
-CELERY_BROKER_URL = os.environ.get("CELERY_BROKER_URL")
+CELERY_BROKER_URL = "amqp://datatracker:{password}@{host}/{queue}".format(
+    host=os.environ.get("RABBITMQ_HOSTNAME", "rabbitmq"),
+    password=os.environ.get("CELERY_PASSWORD", ""),
+    queue=os.environ.get("RABBITMQ_QUEUE", "dt")
+)
 
 IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
 IDSUBMIT_REPOSITORY_PATH = "/test/id/"
diff --git a/helm/values.yaml b/helm/values.yaml
index c64105abb..2902b346b 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -179,7 +179,7 @@ celery:
 
   livenessProbe:
     exec:
-      command: ["celery", "inspect", "ping"] 
+      command: ["celery", "-A", "ietf", "inspect", "ping"] 
     periodSeconds: 30
     timeoutSeconds: 5
 
@@ -233,7 +233,7 @@ celery:
     successThreshold: 1
     failureThreshold: 60
     exec:
-      command: ["celery", "inspect", "ping"]
+      command: ["celery", "-A", "ietf", "inspect", "ping"] 
 
   # Additional volumes on the output Deployment definition.
   volumes:
@@ -290,7 +290,7 @@ beat:
 
   livenessProbe:
     exec:
-      command: ["celery", "inspect", "ping"]
+      command: ["celery", "-A", "ietf", "inspect", "ping"] 
     periodSeconds: 30
     timeoutSeconds: 5
 
@@ -344,7 +344,7 @@ beat:
     successThreshold: 1
     failureThreshold: 60
     exec:
-      command: ["celery", "inspect", "ping"]
+      command: ["celery", "-A", "ietf", "inspect", "ping"] 
 
   # Additional volumes on the output Deployment definition.
   volumes:
@@ -389,9 +389,9 @@ beat:
 rabbitmq:
   name: "rabbitmq"
   image:
-    repository: "rabbitmq"
+    repository: "ghcr.io/ietf-tools/datatracker-mq"
     pullPolicy: IfNotPresent
-    tag: "3.13"
+    tag: "3.12-alpine"
 
   imagePullSecrets: []
   nameOverride: ""
@@ -567,4 +567,4 @@ env:
   DBUSER: "django"
   DBPASS: "RkTkDPFnKpko"
   DJANGO_SECRET_KEY: "PDwXboUq!=hPjnrtG2=ge#N$Dwy+wn@uivrugwpic8mxyPfHk"
-  CELERY_BROKER_URL: "amqp://datatracker:frog@rabbitmq/dt"
+  CELERY_PASSWORD: "this-is-a-secret"