diff --git a/rsyslog/files/rsyslog.default.conf b/rsyslog/files/rsyslog.default.conf
index bd6a53f..edc2fca 100644
--- a/rsyslog/files/rsyslog.default.conf
+++ b/rsyslog/files/rsyslog.default.conf
@@ -33,7 +33,7 @@
 $IncludeConfig {{ global.rsyslog_d }}/*.conf
 
 {% if global.format is defined -%}
-$Template {{ global.format.name }},{{ global.format.template }}
+$Template {{ global.format.name }}, "{{ global.format.template }}"
 $ActionFileDefaultTemplate {{ global.format.name }}
 {% else -%}
 $template RSYSLOG_TraditionalFileFormat
diff --git a/rsyslog/map.jinja b/rsyslog/map.jinja
index 1902475..894d9b7 100644
--- a/rsyslog/map.jinja
+++ b/rsyslog/map.jinja
@@ -19,6 +19,9 @@
   modules:
   - imuxsock
   - imklog
+  format:
+    name: Rfc3164Log
+    template: '<%PRI%>%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag:1:32%%msg:::sp-if-no-1st-sp%%msg%\n'
   output:
     file:
       /var/log/syslog:
@@ -95,6 +98,9 @@
   modules:
   - imjournal
   - imuxsock
+  format:
+    name: Rfc3164Log
+    template: '<%PRI%>%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag:1:32%%msg:::sp-if-no-1st-sp%%msg%\n'
   output:
     file:
       /var/log/messages: