diff --git a/ansible/roles/common/templates/cron-logrotate-keepalived.conf.j2 b/ansible/roles/common/templates/cron-logrotate-keepalived.conf.j2
index 0346c05..6808746 100644
--- a/ansible/roles/common/templates/cron-logrotate-keepalived.conf.j2
+++ b/ansible/roles/common/templates/cron-logrotate-keepalived.conf.j2
@@ -1,3 +1,3 @@
-"/var/log/kolla/haproxy/keepalived.log"
+"/var/log/kolla/keepalived/keepalived.log"
 {
 }
diff --git a/ansible/roles/common/templates/heka-haproxy.toml.j2 b/ansible/roles/common/templates/heka-haproxy.toml.j2
index 1023569..c5ded0e 100644
--- a/ansible/roles/common/templates/heka-haproxy.toml.j2
+++ b/ansible/roles/common/templates/heka-haproxy.toml.j2
@@ -11,6 +11,6 @@ folder_perm = "755"
 [keepalived_file_output]
 type = "FileOutput"
 message_matcher = "Fields[programname] =~ /(?i:keepalived)/"
-path = "/var/log/kolla/haproxy/keepalived.log"
+path = "/var/log/kolla/keepalived/keepalived.log"
 encoder = "syslog_encoder"
 folder_perm = "755"
diff --git a/ansible/roles/haproxy/tasks/start.yml b/ansible/roles/haproxy/tasks/start.yml
index 7ad4d10..bb43bc1 100644
--- a/ansible/roles/haproxy/tasks/start.yml
+++ b/ansible/roles/haproxy/tasks/start.yml
@@ -10,6 +10,7 @@
       - "{{ node_config_directory }}/haproxy/:{{ container_config_directory }}/:ro"
       - "haproxy_socket:/var/lib/kolla/haproxy/"
       - "heka_socket:/var/lib/kolla/heka/"
+      - "kolla_logs:/var/log/kolla/"

 - name: Starting keepalived container
   kolla_docker:
@@ -23,6 +24,7 @@
       - "/lib/modules:/lib/modules:ro"
       - "haproxy_socket:/var/lib/kolla/haproxy/"
       - "heka_socket:/var/lib/kolla/heka/"
+      - "kolla_logs:/var/log/kolla/"

 - name: Ensuring latest haproxy config is used
   command: docker exec haproxy /usr/local/bin/kolla_ensure_haproxy_latest_config
diff --git a/docker/haproxy/extend_start.sh b/docker/haproxy/extend_start.sh
index e2d13f4..d4a0774 100644
--- a/docker/haproxy/extend_start.sh
+++ b/docker/haproxy/extend_start.sh
@@ -1,5 +1,15 @@
 #!/bin/bash

+
+# Create log directory, with appropriate permissions
+if [[ ! -d "/var/log/kolla/haproxy" ]]; then
+    mkdir -p /var/log/kolla/haproxy
+fi
+if [[ $(stat -c %a /var/log/kolla/haproxy) != "755" ]]; then
+    chmod 755 /var/log/kolla/haproxy
+fi
+
+
 # We are intentionally not using exec so we can reload the haproxy config later
 echo "Running command: '${CMD}'"
 $CMD
diff --git a/docker/keepalived/extend_start.sh b/docker/keepalived/extend_start.sh
index 0cb7976..191977d 100644
--- a/docker/keepalived/extend_start.sh
+++ b/docker/keepalived/extend_start.sh
@@ -13,3 +13,12 @@ modprobe ip_vs
 if [ -f /run/keepalived.pid ]; then
     rm /run/keepalived.pid
 fi
+
+# Create log directory, with appropriate permissions
+if [[ ! -d "/var/log/kolla/keepalived" ]]; then
+    mkdir -p /var/log/kolla/keepalived
+fi
+if [[ $(stat -c %a /var/log/kolla/keepalived) != "755" ]]; then
+    chmod 755 /var/log/kolla/keepalived
+fi
+