diff --git a/terraform/dotnet/eks/linux/main.tf b/terraform/dotnet/eks/linux/main.tf
index 5e06eeb74..dc717ec6e 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-remote-${var.test_id}"
+    name      = "dotnet-r-app-deployment-${var.test_id}"
     namespace = var.test_namespace
     labels    = {
       app = "remote-app"
diff --git a/terraform/java/eks-otlp-ocb/main.tf b/terraform/java/eks-otlp-ocb/main.tf
index f150e389e..96b244de1 100644
--- a/terraform/java/eks-otlp-ocb/main.tf
+++ b/terraform/java/eks-otlp-ocb/main.tf
@@ -154,7 +154,7 @@ resource "kubernetes_service" "sample_app_service" {
 resource "kubernetes_deployment" "sample_remote_app_deployment" {
 
   metadata {
-    name      = "sample-remote-${var.test_id}"
+    name      = "sample-r-app-deployment-${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 ae0062893..1a9a738d9 100644
--- a/terraform/java/eks/main.tf
+++ b/terraform/java/eks/main.tf
@@ -205,14 +205,11 @@ resource "kubernetes_deployment" "sample_remote_app_deployment" {
   }
 }
 
-resource "kubernetes_service" "sample_remote_app_deployment" {
+resource "kubernetes_service" "sample_remote_app_service" {
   depends_on = [ kubernetes_deployment.sample_remote_app_deployment ]
 
   metadata {
-    # 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}"
+    name = "sample-remote-app-service"
     namespace = var.test_namespace
   }
   spec {
@@ -263,4 +260,4 @@ resource "kubernetes_deployment" "traffic_generator" {
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/terraform/node/eks/main.tf b/terraform/node/eks/main.tf
index ee79bc8f0..d2864af7c 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-remote-${var.test_id}"
+    name      = "sample-r-app-deployment-${var.test_id}"
     namespace = var.test_namespace
     labels    = {
       app = "remote-app"
diff --git a/terraform/python/eks/main.tf b/terraform/python/eks/main.tf
index b80204298..0fbafde7f 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-remote-${var.test_id}"
+    name      = "python-r-app-deployment-${var.test_id}"
     namespace = var.test_namespace
     labels    = {
       app = "remote-app"