diff --git a/nginx/files/nginx.conf b/nginx/files/nginx.conf
index b2d6738..3b4f27a 100644
--- a/nginx/files/nginx.conf
+++ b/nginx/files/nginx.conf
@@ -35,8 +35,11 @@
         # Logging Settings
         ##
 
-        map $time_local $datetime {
-          "~(?<datetime_part>[0-9]{2}/[A-Z][a-z]{2}/[0-9]{4}:[0-9]{2}:[0-9]{2}:[0-9]{2})\s" $datetime_part;
+        map $time_local $date {
+          "~(?<date_part>[0-9]{2}/[A-Z][a-z]{2}/[0-9]{4}):(?:[0-9]{2}:[0-9]{2}:[0-9]{2})\s" $date_part;
+        }
+        map $time_local $time {
+          "~(?:[0-9]{2}/[A-Z][a-z]{2}/[0-9]{4}):(?<time_part>[0-9]{2}:[0-9]{2}:[0-9]{2})\s" $time_part;
         }
         map $time_local $timezone {
           "~(?<timezone_part>Z|[+-]\d{2}(?::?\d{2})?)" $timezone_part;
@@ -45,7 +48,7 @@
           ~\.(?<millisec_part>[0-9]+)$ $millisec_part;
         }
 
-        log_format combine_with_milliseconds '$remote_addr - $remote_user [$datetime.$millisec $timezone] '
+        log_format combine_with_milliseconds '$remote_addr - $remote_user [$date $time.$millisec $timezone] '
                        '"$request" $status $bytes_sent '
                        '"$http_referer" "$http_user_agent"';
 
diff --git a/nginx/meta/fluentd.yml b/nginx/meta/fluentd.yml
index 8767e89..42e69ab 100644
--- a/nginx/meta/fluentd.yml
+++ b/nginx/meta/fluentd.yml
@@ -12,7 +12,7 @@
             pos_file: {{ pillar.fluentd.agent.dir.positiondb }}/nginx.access.pos
             parser:
               type: regexp
-              time_format: '%d/%b/%Y:%H:%M:%S.%N %z'
+              time_format: '%d/%b/%Y %H:%M:%S.%N %z'
               time_key: Timestamp
               keep_time_key: true
               # access_log format: https://regex101.com/r/CkdzZP/3