diff --git a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
index e8bd518efe..790b250b60 100644
--- a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
@@ -6,10 +6,24 @@
 #
 
 [loggers]
-keys=root,nodepool,requests,shade,image,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_devstack-centos7,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_devstack-centos7,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_devstack-centos7,tripleo-test-cloud-rh1_tripleo-f22,dib_debian-jessie,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-centos7,dib_centos-7,dib_fedora-23
+keys=root,nodepool,requests,shade,image,
+ rax-dfw_bare-precise, rax-dfw_devstack-trusty,
+ rax-dfw_devstack-centos7, rax-ord_bare-precise,
+ rax-ord_devstack-trusty, rax-ord_devstack-centos7,
+ rax-iad_bare-precise, rax-iad_devstack-trusty,
+ rax-iad_devstack-centos7, tripleo-test-cloud-rh1_tripleo-f22,
+ dib_debian-jessie, dib_ubuntu-trusty, dib_devstack-trusty,
+ dib_devstack-centos7, dib_centos-7, dib_fedora-23
 
 [handlers]
-keys=console,debug,normal,image,rax-dfw_bare-precise,rax-dfw_devstack-trusty,rax-dfw_bare-trusty,rax-dfw_devstack-centos7,rax-ord_bare-precise,rax-ord_devstack-trusty,rax-ord_bare-trusty,rax-ord_devstack-centos7,rax-iad_bare-precise,rax-iad_devstack-trusty,rax-iad_bare-trusty,rax-iad_devstack-centos7,tripleo-test-cloud-rh1_tripleo-f22,dib_debian-jessie,dib_ubuntu-trusty,dib_devstack-trusty,dib_devstack-centos7,dib_centos-7,dib_fedora-23
+keys=console,debug,normal,image,
+ rax-dfw_bare-precise, rax-dfw_devstack-trusty,
+ rax-dfw_devstack-centos7, rax-ord_bare-precise,
+ rax-ord_devstack-trusty, rax-ord_devstack-centos7,
+ rax-iad_bare-precise, rax-iad_devstack-trusty,
+ rax-iad_devstack-centos7, tripleo-test-cloud-rh1_tripleo-f22,
+ dib_debian-jessie, dib_ubuntu-trusty, dib_devstack-trusty,
+ dib_devstack-centos7, dib_centos-7, dib_fedora-23
 
 [formatters]
 keys=simple
@@ -94,18 +108,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-dfw.devstack-trusty.log', 'H', 8, 30,)
 
-[logger_rax-dfw_bare-trusty]
-level=DEBUG
-handlers=rax-dfw_bare-trusty
-qualname=nodepool.image.build.rax-dfw.bare-trusty
-propagate=0
-
-[handler_rax-dfw_bare-trusty]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-dfw.bare-trusty.log', 'H', 8, 30,)
-
 [logger_rax-dfw_devstack-centos7]
 level=DEBUG
 handlers=rax-dfw_devstack-centos7
@@ -142,18 +144,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-ord.devstack-trusty.log', 'H', 8, 30,)
 
-[logger_rax-ord_bare-trusty]
-level=DEBUG
-handlers=rax-ord_bare-trusty
-qualname=nodepool.image.build.rax-ord.bare-trusty
-propagate=0
-
-[handler_rax-ord_bare-trusty]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-ord.bare-trusty.log', 'H', 8, 30,)
-
 [logger_rax-ord_devstack-centos7]
 level=DEBUG
 handlers=rax-ord_devstack-centos7
@@ -190,18 +180,6 @@ class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('<%= @image_log_document_root %>/rax-iad.devstack-trusty.log', 'H', 8, 30,)
 
-[logger_rax-iad_bare-trusty]
-level=DEBUG
-handlers=rax-iad_bare-trusty
-qualname=nodepool.image.build.rax-iad.bare-trusty
-propagate=0
-
-[handler_rax-iad_bare-trusty]
-level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
-formatter=simple
-args=('<%= @image_log_document_root %>/rax-iad.bare-trusty.log', 'H', 8, 30,)
-
 [logger_rax-iad_devstack-centos7]
 level=DEBUG
 handlers=rax-iad_devstack-centos7
diff --git a/tools/nodepool_log_config.py b/tools/nodepool_log_config.py
index 85406099a1..0f9df66309 100755
--- a/tools/nodepool_log_config.py
+++ b/tools/nodepool_log_config.py
@@ -24,6 +24,7 @@ builds and applys some sensible rotation defaults.
 
 import argparse
 import logging
+import textwrap
 import yaml
 
 # default paths and outputs
@@ -43,10 +44,12 @@ _BASIC_FILE = """
 #
 
 [loggers]
-keys=root,nodepool,requests,shade,image,%(logger_titles)s
+keys=root,nodepool,requests,shade,image,
+ %(logger_titles)s
 
 [handlers]
-keys=console,debug,normal,image,%(handler_titles)s
+keys=console,debug,normal,image,
+ %(handler_titles)s
 
 [formatters]
 keys=simple
@@ -217,8 +220,14 @@ def generate_log_config(config, log_dir, image_log_dir, output):
     final_output = _BASIC_FILE % {
         'log_dir': log_dir,
         'image_log_dir': image_log_dir,
-        'logger_titles': ','.join(logger_titles),
-        'handler_titles': ','.join(handler_titles),
+        'logger_titles': "\n".join(textwrap.wrap(', '.join(logger_titles),
+                                                 break_long_words=False,
+                                                 break_on_hyphens=False,
+                                                 subsequent_indent=' ')),
+        'handler_titles': "\n".join(textwrap.wrap(', '.join(handler_titles),
+                                                  break_long_words=False,
+                                                  break_on_hyphens=False,
+                                                  subsequent_indent=' ')),
         'image_loggers_and_handlers': image_loggers_and_handlers,
     }