diff --git a/tomcat-multiple-instances/templates/tomcat-server.xml.j2 b/tomcat-multiple-instances/templates/tomcat-server.xml.j2
index d4f70d3f..89c30530 100644
--- a/tomcat-multiple-instances/templates/tomcat-server.xml.j2
+++ b/tomcat-multiple-instances/templates/tomcat-server.xml.j2
@@ -94,12 +94,15 @@
             >
 
 {% if item.access_log_enabled %}
+        <!-- Automatically substitutes the IP with the one contained
+             in the x-forwarded-for header if that header is set -->
+        <Valve className="org.apache.catalina.valves.RemoteIpValve" />
         <!-- Access log processes all example.
              Documentation at: /docs/config/valve.html
-             Note: The pattern used is equivalent to using pattern="common" -->
+             Note: The pattern used is equivalent to using pattern="combined" -->
         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
                prefix="localhost_access." suffix="log"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b"
+               pattern="combined"
 	       rotatable="False"
 	       />
 {% endif %}
diff --git a/tomcat/templates/tomcat-server.xml.j2 b/tomcat/templates/tomcat-server.xml.j2
index 1bc13376..2268cb41 100644
--- a/tomcat/templates/tomcat-server.xml.j2
+++ b/tomcat/templates/tomcat-server.xml.j2
@@ -139,12 +139,15 @@
         -->
 
 {% if tomcat_access_log_enabled %}
+        <!-- Automatically substitutes the IP with the one contained
+             in the x-forwarded-for header if that header is set -->
+        <Valve className="org.apache.catalina.valves.RemoteIpValve" />
         <!-- Access log processes all example.
              Documentation at: /docs/config/valve.html
-             Note: The pattern used is equivalent to using pattern="common" -->
+             Note: The pattern used is equivalent to using pattern="combined" -->
         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
                prefix="localhost_access." suffix="log"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b"
+               pattern="combined"
 	       rotatable="False"
 	       />
 {% endif %}