diff --git a/charts/site-manager/templates/httproute.yaml b/charts/site-manager/templates/httproute.yaml
index 4d06cb1..26fad3f 100644
--- a/charts/site-manager/templates/httproute.yaml
+++ b/charts/site-manager/templates/httproute.yaml
@@ -13,8 +13,8 @@ spec:
   parentRefs:
     - group: gateway.networking.k8s.io
       kind: Gateway
-      name: {{ .Values.httpRoute.gatewayName | quote }}
-      namespace: {{ .Values.httpRoute.gatewayNamespace | quote }}
+      name: {{ .Values.GATEWAY_SYSTEM_NAME  | quote }}
+      namespace: {{ .Values.GATEWAY_SYSTEM_NAMESPACE | quote }}
   hostnames:
     - {{ include "site-manager.ingress.host" . | quote }}
   rules:
diff --git a/charts/site-manager/values.yaml b/charts/site-manager/values.yaml
index 016c250..5ff453f 100644
--- a/charts/site-manager/values.yaml
+++ b/charts/site-manager/values.yaml
@@ -60,9 +60,8 @@ ingress:
 # Resources are created only when:
 # 1) gateway.networking.k8s.io/v1 CRDs are present
 # 2) PAAS_PLATFORM=KUBERNETES
-httpRoute:
-  gatewayName: default-external-gateway
-  gatewayNamespace: envoy-gateway
+GATEWAY_SYSTEM_NAME: default-external-gateway
+GATEWAY_SYSTEM_NAMESPACE: gateway-system
 
 limits:
   cpu: "20m"