diff --git a/templates/watcherapi/config/10-watcher-wsgi-main.conf b/templates/watcherapi/config/10-watcher-wsgi-main.conf
index 3fc54aed..6bfd3188 100644
--- a/templates/watcherapi/config/10-watcher-wsgi-main.conf
+++ b/templates/watcherapi/config/10-watcher-wsgi-main.conf
@@ -21,6 +21,7 @@
   ## Logging
   ErrorLog /dev/stdout
   ServerSignature Off
+  SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
   CustomLog /dev/stdout combined env=!forwarded
   CustomLog /dev/stdout proxy env=forwarded
   ## set watcher log level to debug
diff --git a/templates/watcherapi/config/httpd.conf b/templates/watcherapi/config/httpd.conf
index 3b0788f6..39ae432e 100644
--- a/templates/watcherapi/config/httpd.conf
+++ b/templates/watcherapi/config/httpd.conf
@@ -36,15 +36,12 @@ AccessFileName .htaccess
         Include "/etc/httpd/conf.modules.d/*.conf"
         Include "/etc/httpd/conf.d/*.conf"
 
-        LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-        LogFormat "%a %l %u %t \"%r\" %>s %b" common
-        LogFormat "%{Referer}i -> %U" referer
-        LogFormat "%{User-agent}i" agent
-        LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded
-
-        ErrorLog /dev/stderr
-        TransferLog /dev/stdout
+        LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+        LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
+
+        SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
+        ErrorLog /dev/stdout
         CustomLog /dev/stdout combined env=!forwarded
-        CustomLog /dev/stdout proxy env=!forwarded
+        CustomLog /dev/stdout proxy env=forwarded
         ## set default apache log level to infor from warning
         LogLevel info