diff --git a/.github/workflows/dotnet-k8s-test.yml b/.github/workflows/dotnet-k8s-test.yml
index 91815ab74..f2c91958d 100644
--- a/.github/workflows/dotnet-k8s-test.yml
+++ b/.github/workflows/dotnet-k8s-test.yml
@@ -186,8 +186,8 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name dotnet-sample-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-deployment-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name dotnet-remote-${{ env.TESTING_ID }}
+          --remote-service-deployment-name dotnet-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
@@ -204,8 +204,8 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name dotnet-sample-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-deployment-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name dotnet-remote-${{ env.TESTING_ID }}
+          --remote-service-deployment-name dotnet-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
@@ -222,8 +222,8 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name dotnet-sample-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-deployment-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name dotnet-remote-${{ env.TESTING_ID }}
+          --remote-service-deployment-name dotnet-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
diff --git a/.github/workflows/java-k8s-test.yml b/.github/workflows/java-k8s-test.yml
index 61bef4c85..a4db9286f 100644
--- a/.github/workflows/java-k8s-test.yml
+++ b/.github/workflows/java-k8s-test.yml
@@ -192,7 +192,7 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name sample-application-${{ env.TESTING_ID }}
-          --remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name java-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
@@ -209,8 +209,8 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name sample-application-${{ env.TESTING_ID }}
-          --remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-deployment-name sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name java-remote-${{ env.TESTING_ID }}
+          --remote-service-deployment-name java-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
@@ -227,8 +227,8 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name sample-application-${{ env.TESTING_ID }}
-          --remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-deployment-name sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name java-remote-${{ env.TESTING_ID }}
+          --remote-service-deployment-name java-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
diff --git a/.github/workflows/node-k8s-test.yml b/.github/workflows/node-k8s-test.yml
index 3002178f0..ef71278e5 100644
--- a/.github/workflows/node-k8s-test.yml
+++ b/.github/workflows/node-k8s-test.yml
@@ -186,7 +186,7 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name sample-application-${{ env.TESTING_ID }}
-          --remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name node-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
@@ -203,8 +203,8 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name sample-application-${{ env.TESTING_ID }}
-          --remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-deployment-name sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name node-remote-${{ env.TESTING_ID }}
+          --remote-service-deployment-name node-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
@@ -221,8 +221,8 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name sample-application-${{ env.TESTING_ID }}
-          --remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-deployment-name sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name node-remote-${{ env.TESTING_ID }}
+          --remote-service-deployment-name node-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
diff --git a/.github/workflows/python-k8s-test.yml b/.github/workflows/python-k8s-test.yml
index 8b546f408..049fe0688 100644
--- a/.github/workflows/python-k8s-test.yml
+++ b/.github/workflows/python-k8s-test.yml
@@ -192,7 +192,7 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name python-sample-application-${{ env.TESTING_ID }}
-          --remote-service-name python-sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name python-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
@@ -209,8 +209,8 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name python-sample-application-${{ env.TESTING_ID }}
-          --remote-service-name python-sample-r-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-deployment-name python-sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name python-remote-${{ env.TESTING_ID }}
+          --remote-service-deployment-name python-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
@@ -227,8 +227,8 @@ jobs:
           --platform-info k8s-cluster-${{ env.TESTING_ID }}
           --app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
           --service-name python-sample-application-${{ env.TESTING_ID }}
-          --remote-service-name python-sample-r-app-deployment-${{ env.TESTING_ID }}
-          --remote-service-deployment-name python-sample-r-app-deployment-${{ env.TESTING_ID }}
+          --remote-service-name python-remote-${{ env.TESTING_ID }}
+          --remote-service-deployment-name python-remote-${{ env.TESTING_ID }}
           --query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
 
diff --git a/terraform/dotnet/eks/linux/main.tf b/terraform/dotnet/eks/linux/main.tf
index dc717ec6e..5e06eeb74 100644
--- a/terraform/dotnet/eks/linux/main.tf
+++ b/terraform/dotnet/eks/linux/main.tf
@@ -153,7 +153,7 @@ resource "kubernetes_service" "dotnet_app_service" {
 resource "kubernetes_deployment" "dotnet_r_app_deployment" {
 
   metadata {
-    name      = "dotnet-r-app-deployment-${var.test_id}"
+    name      = "dotnet-remote-${var.test_id}"
     namespace = var.test_namespace
     labels    = {
       app = "remote-app"
diff --git a/terraform/java/eks/main.tf b/terraform/java/eks/main.tf
index 1a9a738d9..ae0062893 100644
--- a/terraform/java/eks/main.tf
+++ b/terraform/java/eks/main.tf
@@ -205,11 +205,14 @@ resource "kubernetes_deployment" "sample_remote_app_deployment" {
   }
 }
 
-resource "kubernetes_service" "sample_remote_app_service" {
+resource "kubernetes_service" "sample_remote_app_deployment" {
   depends_on = [ kubernetes_deployment.sample_remote_app_deployment ]
 
   metadata {
-    name = "sample-remote-app-service"
+    # use the same name as the deployment to handle the edge case when the deployment name is longer than 47 characters
+    # in this edge case, we just use the service name (rather than deployment name) as RemoteService
+    # see https://github.com/aws/amazon-cloudwatch-agent/pull/1553
+    name      = "sample-r-app-deployment-${var.test_id}"
     namespace = var.test_namespace
   }
   spec {
@@ -260,4 +263,4 @@ resource "kubernetes_deployment" "traffic_generator" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/terraform/java/k8s/deploy/resources/remote-service-depl.yaml b/terraform/java/k8s/deploy/resources/remote-service-depl.yaml
index a599cff97..5f2c94049 100644
--- a/terraform/java/k8s/deploy/resources/remote-service-depl.yaml
+++ b/terraform/java/k8s/deploy/resources/remote-service-depl.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: java-remote-${TESTING_ID}
-  namespace: java-sample-app-namespace
+  namespace: sample-app-namespace
 spec:
   replicas: 1
   selector:
@@ -33,7 +33,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: java-remote-service
-  namespace: java-sample-app-namespace
+  namespace: sample-app-namespace
 spec:
   selector:
     app: remote-app
diff --git a/terraform/node/eks/main.tf b/terraform/node/eks/main.tf
index d2864af7c..ee79bc8f0 100644
--- a/terraform/node/eks/main.tf
+++ b/terraform/node/eks/main.tf
@@ -165,7 +165,7 @@ resource "kubernetes_service" "sample_app_service" {
 resource "kubernetes_deployment" "sample_remote_app_deployment" {
 
   metadata {
-    name      = "sample-r-app-deployment-${var.test_id}"
+    name      = "sample-remote-${var.test_id}"
     namespace = var.test_namespace
     labels    = {
       app = "remote-app"
diff --git a/terraform/node/k8s/deploy/resources/remote-service-depl.yaml b/terraform/node/k8s/deploy/resources/remote-service-depl.yaml
index 82c257d0d..5fe8469da 100644
--- a/terraform/node/k8s/deploy/resources/remote-service-depl.yaml
+++ b/terraform/node/k8s/deploy/resources/remote-service-depl.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: node-remote-${TESTING_ID}
-  namespace: node-sample-app-namespace
+  namespace: sample-app-namespace
 spec:
   replicas: 1
   selector:
@@ -34,7 +34,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: node-remote-service
-  namespace: node-sample-app-namespace
+  namespace: sample-app-namespace
 spec:
   selector:
     app: remote-app
diff --git a/terraform/python/eks/main.tf b/terraform/python/eks/main.tf
index 0fbafde7f..b80204298 100644
--- a/terraform/python/eks/main.tf
+++ b/terraform/python/eks/main.tf
@@ -170,7 +170,7 @@ resource "kubernetes_service" "python_app_service" {
 resource "kubernetes_deployment" "python_r_app_deployment" {
 
   metadata {
-    name      = "python-r-app-deployment-${var.test_id}"
+    name      = "python-remote-${var.test_id}"
     namespace = var.test_namespace
     labels    = {
       app = "remote-app"