diff --git a/docker/rabbitmq/rabbitmq_sudoers b/docker/rabbitmq/rabbitmq_sudoers
index 0891538..b2dc43e 100644
--- a/docker/rabbitmq/rabbitmq_sudoers
+++ b/docker/rabbitmq/rabbitmq_sudoers
@@ -1 +1 @@
-%microservices ALL=(root) NOPASSWD: /usr/bin/chown -R rabbitmq\: /var/lib/rabbitmq, /bin/chown -R rabbitmq\: /var/lib/rabbitmq, /bin/chown -R rabbitmq\: /etc/rabbitmq
+%microservices ALL=(root) NOPASSWD: /bin/chown -R rabbitmq\: /var/lib/rabbitmq, /bin/chown -R rabbitmq\: /etc/rabbitmq, /bin/chown rabbitmq\: /var/log/ccp/rabbitmq
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index b555f81..07de8a1 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -2,3 +2,4 @@ configs:
     rabbitmq_port: 5672
     rabbitmq_password: password
     rabbitmq_user: rabbitmq
+    rabbitmq_log_base: /var/log/ccp/rabbitmq
diff --git a/service/files/rabbitmq-env.conf.j2 b/service/files/rabbitmq-env.conf.j2
new file mode 100644
index 0000000..3cd0991
--- /dev/null
+++ b/service/files/rabbitmq-env.conf.j2
@@ -0,0 +1,2 @@
+NODENAME=rabbitmq
+RABBITMQ_LOG_BASE={{ rabbitmq_log_base }}
diff --git a/service/rabbitmq.yaml b/service/rabbitmq.yaml
index 2bd340f..377ac51 100644
--- a/service/rabbitmq.yaml
+++ b/service/rabbitmq.yaml
@@ -8,15 +8,27 @@ service:
       probes:
         readiness: "true"
         liveness: "true"
+      volumes:
+      - name: rabbitmq-logs
+        path: "{{ rabbitmq_log_base }}"
+        type: host
+        readOnly: False
+      pre:
+        - name: chown-logs-dir
+          command: "sudo /bin/chown rabbitmq: {{ rabbitmq_log_base }}"
       daemon:
         files:
           - rabbitmq-conf
+          - rabbitmq-env
           - erlang-cookie
         command: rabbitmq-server
 files:
   rabbitmq-conf:
     path: /etc/rabbitmq/rabbitmq.config
     content: rabbitmq.config.j2
+  rabbitmq-env:
+    path: /etc/rabbitmq/rabbitmq-env.conf
+    content: rabbitmq-env.conf.j2
   erlang-cookie:
     path: /var/lib/rabbitmq/.erlang.cookie
     content: erlang.cookie