diff --git a/adapter/internal/adapter/adapter.go b/adapter/internal/adapter/adapter.go
index 36e5952e4b..8a02b81ed7 100644
--- a/adapter/internal/adapter/adapter.go
+++ b/adapter/internal/adapter/adapter.go
@@ -77,7 +77,7 @@ const (
 func init() {
 	flag.BoolVar(&debug, "debug", true, "Use debug logging")
 	flag.BoolVar(&onlyLogging, "onlyLogging", false, "Only demo AccessLogging Service")
-	flag.UintVar(&port, "port", 18001, "Management server port")
+	flag.UintVar(&port, "port", 18000, "Management server port")
 	flag.UintVar(&alsPort, "als", 18090, "Accesslog server port")
 	flag.StringVar(&mode, "ads", ads, "Management server type (ads, xds, rest)")
 }
diff --git a/adapter/internal/operator/gateway-api/infrastructure/kubernetes/proxy/resource.go b/adapter/internal/operator/gateway-api/infrastructure/kubernetes/proxy/resource.go
index 185431064c..adec409a2f 100644
--- a/adapter/internal/operator/gateway-api/infrastructure/kubernetes/proxy/resource.go
+++ b/adapter/internal/operator/gateway-api/infrastructure/kubernetes/proxy/resource.go
@@ -662,7 +662,7 @@ func expectedEnforcerEnv(containerSpec *egv1a1.KubernetesContainerSpec) []corev1
 		},
 		{
 			Name:  "ADAPTER_XDS_PORT",
-			Value: "18001",
+			Value: "18000",
 		},
 		{
 			Name:  "COMMON_CONTROLLER_XDS_PORT",
diff --git a/adapter/resources/check_health.sh b/adapter/resources/check_health.sh
index 93c56cad5d..8d5e18abd5 100755
--- a/adapter/resources/check_health.sh
+++ b/adapter/resources/check_health.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 # -----------------------------------------------------------------------
 
-ADAPTER_XDS_PORT="${ADAPTER_XDS_PORT:-18001}"
+ADAPTER_XDS_PORT="${ADAPTER_XDS_PORT:-18000}"
 ADAPTER_SERVER_NAME="${ADAPTER_SERVER_NAME:-adapter}"
 grpc_health_probe -addr "127.0.0.1:${ADAPTER_XDS_PORT}" \
     -tls \
diff --git a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/config/EnvVarConfig.java b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/config/EnvVarConfig.java
index e9c484dbcf..a3b31bce7a 100644
--- a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/config/EnvVarConfig.java
+++ b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/config/EnvVarConfig.java
@@ -68,7 +68,7 @@ public class EnvVarConfig {
     private static final String DEFAULT_ENFORCER_PUBLIC_CERT_PATH = "/home/wso2/security/keystore/mg.pem";
     private static final String DEFAULT_ENFORCER_REGION_ID = "UNKNOWN";
     private static final String DEFAULT_ADAPTER_HOST = "adapter";
-    private static final String DEFAULT_ADAPTER_XDS_PORT = "18001";
+    private static final String DEFAULT_ADAPTER_XDS_PORT = "18000";
     private static final String DEFAULT_COMMON_CONTROLLER_HOST = "common-controller";
     private static final String DEFAULT_COMMON_CONTROLLER_XDS_PORT = "18002";
     private static final String DEFAULT_COMMON_CONTROLLER_REST_PORT = "18003";
diff --git a/helm-charts/templates/data-plane/gateway-components/adapter/adapter-grpc-probe-script-conf.yaml b/helm-charts/templates/data-plane/gateway-components/adapter/adapter-grpc-probe-script-conf.yaml
index abecda2fab..9d1d9bde92 100644
--- a/helm-charts/templates/data-plane/gateway-components/adapter/adapter-grpc-probe-script-conf.yaml
+++ b/helm-charts/templates/data-plane/gateway-components/adapter/adapter-grpc-probe-script-conf.yaml
@@ -38,7 +38,7 @@ data:
     # limitations under the License.
     # -----------------------------------------------------------------------
 
-    ADAPTER_XDS_PORT="${ADAPTER_XDS_PORT:-18001}"
+    ADAPTER_XDS_PORT="${ADAPTER_XDS_PORT:-18000}"
     grpc_health_probe -addr "127.0.0.1:${ADAPTER_XDS_PORT}" \
         -tls \
         -tls-ca-cert "${ADAPTER_PUBLIC_CERT_PATH}" \