diff --git a/apm-collector/apm-collector-boot/src/main/resources/application.yml b/apm-collector/apm-collector-boot/src/main/resources/application.yml
index 570863a22..c5f2008b7 100644
--- a/apm-collector/apm-collector-boot/src/main/resources/application.yml
+++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml
@@ -5,12 +5,12 @@
 naming:
   jetty:
     host: localhost
-    port: 12800
+    port: 10800
     context_path: /
 remote:
   gRPC:
     host: localhost
-    port: 10800
+    port: 11800
 agent_gRPC:
   gRPC:
     host: localhost
diff --git a/apm-collector/apm-collector-core/src/main/resources/application-default.yml b/apm-collector/apm-collector-core/src/main/resources/application-default.yml
index 200609e65..3fb433933 100644
--- a/apm-collector/apm-collector-core/src/main/resources/application-default.yml
+++ b/apm-collector/apm-collector-core/src/main/resources/application-default.yml
@@ -6,15 +6,15 @@ cache:
   guava:
 queue:
   disruptor:
-remote:
-  gRPC:
-    host: localhost
-    port: 11800
 naming:
   jetty:
     host: localhost
     port: 10800
     context_path: /
+remote:
+  gRPC:
+    host: localhost
+    port: 11800
 agent_gRPC:
   gRPC:
     host: localhost