diff --git a/helm-charts/templates/data-plane/config-deployer/config-api-route.yaml b/helm-charts/templates/data-plane/config-deployer/config-api-route.yaml
index e4c0b75a2..ac84d2aaf 100644
--- a/helm-charts/templates/data-plane/config-deployer/config-api-route.yaml
+++ b/helm-charts/templates/data-plane/config-deployer/config-api-route.yaml
@@ -23,7 +23,7 @@ metadata:
     managed-by: "apk"
 spec:
   hostnames:
-  - "api.am.wso2.com"
+  - "{{ .Values.wso2.apk.listener.hostname | default "api.am.wso2.com"}}"
   rules:
   - matches:
     - path:
diff --git a/helm-charts/templates/data-plane/config-deployer/config-deploy-api-route.yaml b/helm-charts/templates/data-plane/config-deployer/config-deploy-api-route.yaml
index 6a341a605..c3fb37b2d 100644
--- a/helm-charts/templates/data-plane/config-deployer/config-deploy-api-route.yaml
+++ b/helm-charts/templates/data-plane/config-deployer/config-deploy-api-route.yaml
@@ -23,7 +23,7 @@ metadata:
     managed-by: "apk"
 spec:
   hostnames:
-  - "api.am.wso2.com"
+  - "{{ .Values.wso2.apk.listener.hostname | default "api.am.wso2.com"}}"
   rules:
   - matches:
     - path:
diff --git a/helm-charts/templates/data-plane/gateway-components/gateway-runtime/jwks-domain-api-httproute.yaml b/helm-charts/templates/data-plane/gateway-components/gateway-runtime/jwks-domain-api-httproute.yaml
index c4a509d96..d87be60a8 100644
--- a/helm-charts/templates/data-plane/gateway-components/gateway-runtime/jwks-domain-api-httproute.yaml
+++ b/helm-charts/templates/data-plane/gateway-components/gateway-runtime/jwks-domain-api-httproute.yaml
@@ -24,7 +24,7 @@ metadata:
     api-version: "1.0.0"
 spec:
   hostnames:
-  - "api.am.wso2.com"
+  - "{{ .Values.wso2.apk.listener.hostname | default "api.am.wso2.com"}}"
   rules:
   - matches:
     - path: