diff --git a/docker/elk/logstash/dist/http_output.conf b/docker/elk/logstash/dist/http_output.conf
index 37f23e30..7d90509f 100644
--- a/docker/elk/logstash/dist/http_output.conf
+++ b/docker/elk/logstash/dist/http_output.conf
@@ -645,11 +645,6 @@ filter {
     date {
       match => [ "timestamp", "ISO8601" ]
     }
-    mutate {
-      rename => {
-        "request" => "request_data"
-      }
-    }
   }
 
 # Tanner
diff --git a/docker/elk/logstash/dist/logstash.conf b/docker/elk/logstash/dist/logstash.conf
index d02095f3..08f03121 100644
--- a/docker/elk/logstash/dist/logstash.conf
+++ b/docker/elk/logstash/dist/logstash.conf
@@ -645,11 +645,6 @@ filter {
     date {
       match => [ "timestamp", "ISO8601" ]
     }
-    mutate {
-      rename => {
-        "request" => "request_data"
-      }
-    }
   }
 
 # Tanner
diff --git a/docker/heimdall/dist/conf/nginx.conf b/docker/heimdall/dist/conf/nginx.conf
index 70c4d552..dbe2d6f9 100644
--- a/docker/heimdall/dist/conf/nginx.conf
+++ b/docker/heimdall/dist/conf/nginx.conf
@@ -39,18 +39,47 @@ http {
 	# Logging Settings
 	##
 
-        log_format le_json '{ "timestamp": "$time_iso8601", '
- 	'"src_ip": "$remote_addr", '
- 	'"remote_user": "$remote_user", '
- 	'"body_bytes_sent": "$body_bytes_sent", '
- 	'"request_time": "$request_time", '
- 	'"status": "$status", '
- 	'"request": "$request", '
- 	'"request_method": "$request_method", '
- 	'"http_referrer": "$http_referer", '
- 	'"http_user_agent": "$http_user_agent" }';
- 
- 	access_log /var/log/nginx/access.log le_json;
+      log_format main_json escape=json '{'
+        '"msec": "$msec", ' # request unixtime in seconds with a milliseconds resolution
+        '"connection_serial": "$connection", ' # connection serial number
+        '"connection_requests": "$connection_requests", ' # number of requests made in connection
+        '"pid": "$pid", ' # process pid
+        '"request_id": "$request_id", ' # the unique request id
+        '"request_length": "$request_length", ' # request length (including headers and body)
+        '"src_ip": "$remote_addr", ' # client IP
+        '"remote_user": "$remote_user", ' # client HTTP username
+        '"src_port": "$remote_port", ' # client port
+        '"time_local": "$time_local", '
+        '"time_iso8601": "$time_iso8601", ' # local time in the ISO 8601 standard format
+        '"request_data": "$request", ' # full path no arguments if the request
+        '"request_uri": "$request_uri", ' # full path and arguments if the request
+        '"args": "$args", ' # args
+        '"status": "$status", ' # response status code
+        '"body_bytes_sent": "$body_bytes_sent", ' # the number of body bytes exclude headers sent to a client
+        '"bytes_sent": "$bytes_sent", ' # the number of bytes sent to a client
+        '"http_referer": "$http_referer", ' # HTTP referer
+        '"http_user_agent": "$http_user_agent", ' # user agent
+        '"http_x_forwarded_for": "$http_x_forwarded_for", ' # http_x_forwarded_for
+        '"http_host": "$http_host", ' # the request Host: header
+        '"server_name": "$server_name", ' # the name of the vhost serving the request
+        '"request_time": "$request_time", ' # request processing time in seconds with msec resolution
+        '"upstream": "$upstream_addr", ' # upstream backend server for proxied requests
+        '"upstream_connect_time": "$upstream_connect_time", ' # upstream handshake time incl. TLS
+        '"upstream_header_time": "$upstream_header_time", ' # time spent receiving upstream headers
+        '"upstream_response_time": "$upstream_response_time", ' # time spend receiving upstream body
+        '"upstream_response_length": "$upstream_response_length", ' # upstream response length
+        '"upstream_cache_status": "$upstream_cache_status", ' # cache HIT/MISS where applicable
+        '"ssl_protocol": "$ssl_protocol", ' # TLS protocol
+        '"ssl_cipher": "$ssl_cipher", ' # TLS cipher
+        '"scheme": "$scheme", ' # http or https
+        '"request_method": "$request_method", ' # request method
+        '"server_protocol": "$server_protocol", ' # request protocol, like HTTP/1.1 or HTTP/2.0
+        '"pipe": "$pipe", ' # “p” if request was pipelined, “.” otherwise
+        '"gzip_ratio": "$gzip_ratio", '
+        '"http_cf_ray": "$http_cf_ray"'
+      '}';
+
+ 	access_log /var/log/nginx/access.log main_json;
 	error_log /var/log/nginx/error.log;
 
 	##