diff --git a/designate/files/logging.conf b/designate/files/logging.conf
deleted file mode 100644
index f6df840..0000000
--- a/designate/files/logging.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-{%- set log_handlers = [] -%}
-{%- for log_handler_name, log_handler_attrs in values.logging.log_handlers.items() %}
-  {%- if log_handler_attrs.get('enabled', False) %}
-    {%- do log_handlers.append(log_handler_name) -%}
-  {%- endif %}
-{%- endfor %}
-[loggers]
-keys = root, designate
-
-[handlers]
-keys = {{ log_handlers | join(", ") }}
-
-[formatters]
-keys = context, default{% if values.logging.log_handlers.get('fluentd',{}).get('enabled', False) %}, fluentd{% endif %}
-
-[logger_root]
-level = {{ values.logging.get('loggers', {}).get('root', {}).get('level', 'WARNING') }}
-handlers = {{ log_handlers | join(", ") }}
-
-[logger_amqp]
-level = {{ values.logging.get('loggers', {}).get('amqp', {}).get('level', 'WARNING') }}
-handlers = {{ log_handlers | join(", ") }}
-qualname = amqp
-
-[logger_designate]
-level = {{ values.logging.get('loggers', {}).get('designate', {}).get('level', 'INFO') }}
-handlers = {{ log_handlers | join(", ") }}
-qualname = designate
-propagate = 0
-
-[logger_amqplib]
-level = {{ values.logging.get('loggers', {}).get('amqplib', {}).get('level', 'WARNING') }}
-handlers = {{ log_handlers | join(", ") }}
-qualname = amqplib
-
-[logger_sqlalchemy]
-level = {{ values.logging.get('loggers', {}).get('sqlalchemy', {}).get('level', 'WARNING') }}
-handlers = {{ log_handlers | join(", ") }}
-qualname = sqlalchemy
-# "level = INFO" logs SQL queries.
-# "level = DEBUG" logs SQL queries and results.
-# "level = WARNING" logs neither.  (Recommended for production systems.)
-
-[logger_boto]
-level = {{ values.logging.get('loggers', {}).get('boto', {}).get('level', 'WARNING') }}
-handlers = {{ log_handlers | join(", ") }}
-qualname = boto
-
-[logger_suds]
-level = {{ values.logging.get('loggers', {}).get('suds', {}).get('level', 'INFO') }}
-handlers = {{ log_handlers | join(", ") }}
-qualname = suds
-
-[logger_eventletwsgi]
-level = {{ values.logging.get('loggers', {}).get('eventletwsgi', {}).get('level', 'WARNING') }}
-handlers = {{ log_handlers | join(", ") }}
-qualname = eventlet.wsgi.server
-
-{%- if values.logging.log_handlers.get('fluentd', {}).get('enabled', False) %}
-[handler_fluentd]
-class = fluent.handler.FluentHandler
-args = ('openstack.{{ service_name | replace("-", ".") }}', 'localhost', 24224)
-formatter = fluentd
-{%- endif %}
-
-{%- if values.logging.log_handlers.watchedfile.enabled %}
-[handler_watchedfile]
-class = handlers.WatchedFileHandler
-args = ('/var/log/designate/{{ service_name }}.log',)
-formatter = context
-{%- endif %}
-
-{% if values.logging.log_handlers.get('ossyslog', {}).get('enabled', False) -%}
-{%- set ossyslog_args = values.logging.log_handlers.ossyslog.get('args', {}) -%}
-[handler_ossyslog]
-class = oslo_log.handlers.OSSysLogHandler
-# the OSSysLogHandler uses 'syslog' lib, where the LOG_* facilities are already *8
-# but in the context where the args are evaluated we have access only to Python's
-# handlers.SysLogHandler.LOG_* constants that _ARE_NOT_ multiplied by 8.
-# To not have a completely magic single int in the rendered template,
-# we multiply it here.
-args = ( 8 * handlers.SysLogHandler.{{ ossyslog_args.get('facility', 'LOG_USER') }}, )
-formatter = context
-{%- endif %}
-
-[formatter_context]
-class = oslo_log.formatters.ContextFormatter
-
-[formatter_default]
-format = %(message)s
-
-{%- if values.logging.log_handlers.get('fluentd', {}).get('enabled', False) %}
-[formatter_fluentd]
-class = oslo_log.formatters.FluentFormatter
-{%- endif %}
diff --git a/designate/map.jinja b/designate/map.jinja
index cf215c6..c299c7e 100644
--- a/designate/map.jinja
+++ b/designate/map.jinja
@@ -16,6 +16,7 @@
         'services': ['designate-api', 'designate-central', 'designate-sink'],
         'cacert_file': '/etc/ssl/certs/ca-certificates.crt',
         'logging': {
+          'app_name': 'designate',
           'log_appender': false,
           'log_handlers': {
             'watchedfile': {
@@ -29,6 +30,7 @@
         'services': ['designate-api', 'designate-central', 'designate-sink'],
         'cacert_file': '/etc/pki/tls/certs/ca-bundle.crt',
         'logging': {
+          'app_name': 'designate',
           'log_appender': false,
           'log_handlers': {
             'watchedfile': {
@@ -55,6 +57,7 @@
         'pkgs': ['designate-worker', 'designate-mdns', 'designate-producer'],
         'services': ['designate-worker', 'designate-mdns', 'designate-producer'],
         'logging': {
+          'app_name': 'designate',
           'log_appender': false,
           'log_handlers': {
             'watchedfile': {
@@ -67,6 +70,7 @@
         'pkgs': ['openstack-designate-worker', 'openstack-designate-mdns', 'openstack-designate-producer'],
         'services': ['designate-worker', 'designate-mdns', 'designate-producer'],
         'logging': {
+          'app_name': 'designate',
           'log_appender': false,
           'log_handlers': {
             'watchedfile': {
diff --git a/designate/server.sls b/designate/server.sls
index 341a1a4..4f53f27 100644
--- a/designate/server.sls
+++ b/designate/server.sls
@@ -51,13 +51,13 @@
 designate_general_logging_conf:
   file.managed:
     - name: /etc/designate/logging.conf
-    - source: salt://designate/files/logging.conf
+    - source: salt://oslo_templates/files/logging/_logging.conf
     - template: jinja
     - user: designate
     - group: designate
     - defaults:
         service_name: designate
-        values: {{ server }}
+        _data: {{ server.logging }}
     - require:
       - pkg: designate_server_packages
 {%- if server.logging.log_handlers.get('fluentd', {}).get('enabled', False) %}
@@ -77,14 +77,14 @@
 {{ service_name }}_logging_conf:
   file.managed:
     - name: /etc/designate/logging/logging-{{ service_name }}.conf
-    - source: salt://designate/files/logging.conf
+    - source: salt://oslo_templates/files/logging/_logging.conf
     - template: jinja
     - makedirs: True
     - user: designate
     - group: designate
     - defaults:
         service_name: {{ service_name }}
-        values: {{ server }}
+        _data: {{ server.logging }}
     - require:
       - pkg: designate_server_packages
 {%- if server.logging.log_handlers.get('fluentd', {}).get('enabled', False) %}
diff --git a/designate/worker.sls b/designate/worker.sls
index b6998e2..fb3f91c 100644
--- a/designate/worker.sls
+++ b/designate/worker.sls
@@ -39,14 +39,14 @@
 {{ service_name }}_worker_logging_conf:
   file.managed:
     - name: /etc/designate/logging/logging-{{ service_name }}.conf
-    - source: salt://designate/files/logging.conf
+    - source: salt://oslo_templates/files/logging/_logging.conf
     - template: jinja
     - makedirs: True
     - user: designate
     - group: designate
     - defaults:
         service_name: {{ service_name }}
-        values: {{ worker }}
+        _data: {{ worker.logging }}
     - require:
       - pkg: designate_worker_packages
 {%- if worker.logging.log_handlers.get('fluentd', {}).get('enabled', False) %}