diff --git a/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2 b/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2
index 64773e5691..c4c5867641 100644
--- a/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2
+++ b/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2
@@ -9,7 +9,7 @@
     rewriterule6 programname ^(magnum-conductor|magnum-api).* openstack_python
     rewriterule7 programname ^(keystone).* openstack_python
     rewriterule8 programname ^(heat-engine|heat-api|heat-api-cfn).* openstack_python
-    rewriterule9 programname ^(registry|api).* openstack_python
+    rewriterule9 programname ^(glance-api|glance-registry).* openstack_python
     rewriterule10 programname ^(cloudkitty-storage-init|cloudkitty-processor|cloudkitty-dbsync|cloudkitty-api).* openstack_python
     rewriterule11 programname ^(ceilometer-polling|ceilometer-collector|ceilometer-agent-notification|loadwsgi).* openstack_python
     rewriterule12 programname ^(barbican-worker|barbican-keystone-listener|barbican-db-manage|barbican-api|app).* openstack_python
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index bbeab9b0f8..bf7b1ef4df 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -2,7 +2,7 @@
 debug = {{ glance_logging_debug }}
 
 # NOTE(elemoine) log_dir alone does not work for Glance
-log_file = /var/log/kolla/glance/api.log
+log_file = /var/log/kolla/glance/glance-api.log
 use_forwarded_for = true
 
 bind_host = {{ api_interface_address }}
diff --git a/ansible/roles/glance/templates/glance-registry.conf.j2 b/ansible/roles/glance/templates/glance-registry.conf.j2
index 4c837e25d8..7b2259982c 100644
--- a/ansible/roles/glance/templates/glance-registry.conf.j2
+++ b/ansible/roles/glance/templates/glance-registry.conf.j2
@@ -2,7 +2,7 @@
 debug = {{ glance_logging_debug }}
 
 # NOTE(elemoine) log_dir alone does not work for Glance
-log_file = /var/log/kolla/glance/registry.log
+log_file = /var/log/kolla/glance/glance-registry.log
 
 bind_host = {{ api_interface_address }}
 bind_port = {{ glance_registry_port }}