diff --git a/config/runtime.exs b/config/runtime.exs
index f6b6b5f..1512fbd 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -21,7 +21,17 @@ config :logger, level: logger_level
 
 config :logger, :console, format: {Logger.Formatter, :format}
 
-if amqp_url = System.get_env("AMQP_URL") do
+rabbitmq_host = System.get_env("RABBITMQ_HOST", "localhost")
+rabbitmq_vhost = System.get_env("RABBITMQ_VHOST", "/")
+rabbitmq_username = System.get_env("RABBITMQ_USERNAME")
+rabbitmq_password = System.get_env("RABBITMQ_PASSWORD")
+
+amqp_url =
+  if rabbitmq_username && rabbitmq_password do
+    "amqp://#{rabbitmq_username}:#{rabbitmq_password}@#{rabbitmq_host}/#{rabbitmq_vhost}"
+  end
+
+if amqp_url do
   config :policy_service, :amqp_url, amqp_url
 end
 
diff --git a/ops/chart/values.yaml b/ops/chart/values.yaml
index 18815de..e9ac725 100644
--- a/ops/chart/values.yaml
+++ b/ops/chart/values.yaml
@@ -30,11 +30,20 @@ controllers:
           PORT: "8080"
           PHX_HOST: "0.0.0.0"
           PHX_SERVER: "true"
-          AMQP_URL:
+          RABBITMQ_HOST:
+            value: "rabbitmq.rabbitmq.svc.cluster.local"
+          RABBITMQ_VHOST:
+            value: "application"
+          RABBITMQ_USERNAME:
             valueFrom:
               secretKeyRef:
                 name: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}-rabbitmq-user'
-                key: connection_string
+                key: username
+          RABBITMQ_PASSWORD:
+            valueFrom:
+              secretKeyRef:
+                name: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}-rabbitmq-user'
+                key: password
           RELEASE_COOKIE:
             valueFrom:
               secretKeyRef:
@@ -86,7 +95,6 @@ service:
         port: 8080
         protocol: HTTP
 
-
 route:
   main:
     parentRefs: