diff --git a/rabbitmq.yaml b/rabbitmq.yaml
index d5689b6..380562c 100644
--- a/rabbitmq.yaml
+++ b/rabbitmq.yaml
@@ -7,6 +7,14 @@ data:
   RABBITMQ_VHOST: /
   RABBITMQ_USERNAME: user
 ---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: rabbitmq-env-config
+data:
+  memory.conf: |-
+    total_memory_available_override_value = 1GB
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -48,7 +56,9 @@ spec:
           value: "15672"
         - name: RABBITMQ_DISK_FREE_LIMIT
           value: '"8GiB"'
-        image: sparetimecoders/rabbitmq:latest
+        - name: RABBITMQ_CONFIG_FILES
+          value: /etc/rabbitmq/conf.d
+        image: rabbitmq:management
         imagePullPolicy: Always
         livenessProbe:
           exec:
@@ -93,15 +103,20 @@ spec:
         volumeMounts:
         - name: data
           mountPath: /var/lib/rabbitmq
+        - name: config
+          mountPath: /etc/rabbitmq/conf.d/20-memory.conf
+          subPath: memory.conf
+          readOnly: true
       volumes:
       - name: data
         hostPath:
           path: /data/rabbitmq
+      - name: config
+        configMap:
+          name: rabbitmq-env-config
       dnsPolicy: ClusterFirst
       restartPolicy: Always
-
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/setup b/setup
index cb495c3..465a36c 100755
--- a/setup
+++ b/setup
@@ -14,4 +14,4 @@ kubectl patch serviceaccount default -p '{"imagePullSecrets": [{"name": "gitlab"
 
 kubectl apply -k .
 
-kubectl wait --for=condition=Ready pods --all
+kubectl wait --for=condition=Ready pods --all --timeout=5m