diff --git a/installer/kubernetes/templates/configmap.yml.j2 b/installer/kubernetes/templates/configmap.yml.j2
index 539c3e43ef..9aafb888fd 100644
--- a/installer/kubernetes/templates/configmap.yml.j2
+++ b/installer/kubernetes/templates/configmap.yml.j2
@@ -16,6 +16,8 @@ data:
     #Autoprovisioning should replace this
     CLUSTER_HOST_ID = socket.gethostname()
     SYSTEM_UUID = '00000000-0000-0000-0000-000000000000'
+
+    REMOTE_HOST_HEADERS = ['HTTP_X_FORWARDED_FOR']
     
     CELERY_TASK_QUEUES += (Queue(CLUSTER_HOST_ID, Exchange(CLUSTER_HOST_ID), routing_key=CLUSTER_HOST_ID),)
     CELERY_TASK_ROUTES['awx.main.tasks.cluster_node_heartbeat'] = {'queue': CLUSTER_HOST_ID, 'routing_key': CLUSTER_HOST_ID}
diff --git a/installer/openshift/templates/configmap.yml.j2 b/installer/openshift/templates/configmap.yml.j2
index 803ea27fa1..79c14fefee 100644
--- a/installer/openshift/templates/configmap.yml.j2
+++ b/installer/openshift/templates/configmap.yml.j2
@@ -17,9 +17,6 @@ data:
     CLUSTER_HOST_ID = socket.gethostname()
     SYSTEM_UUID = '00000000-0000-0000-0000-000000000000'
     
-    # Token-based authentication performs a hash check on HTTP headers expected to be consistent, including the remote host IP.
-    # The default OpenShift router exposes the remote host IP via the X-Forwarded-For header.
-    # You might have to change this setting if you use an additional reverse proxy in front of OpenShift.
     REMOTE_HOST_HEADERS = ['HTTP_X_FORWARDED_FOR']
 
     CELERY_TASK_QUEUES += (Queue(CLUSTER_HOST_ID, Exchange(CLUSTER_HOST_ID), routing_key=CLUSTER_HOST_ID),)