diff --git a/cdk/ec2/lib/user-data/customers-user-data.sh b/cdk/ec2/lib/user-data/customers-user-data.sh
index 5aac569a..cba17709 100644
--- a/cdk/ec2/lib/user-data/customers-user-data.sh
+++ b/cdk/ec2/lib/user-data/customers-user-data.sh
@@ -152,7 +152,7 @@ tmux send-keys -t customers "export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true" C
 tmux send-keys -t customers "export OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics" C-m
 tmux send-keys -t customers "export OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf" C-m
 tmux send-keys -t customers "export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces" C-m
-tmux send-keys -t customers "export OTEL_RESOURCE_ATTRIBUTES=\"service.name=${service_name}\"" C-m
+tmux send-keys -t customers "export OTEL_RESOURCE_ATTRIBUTES=\"service.name=${service_name},Team=Frontend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit\"" C-m
 tmux send-keys -t customers "export SPRING_PROFILES_ACTIVE=ec2" C-m
 tmux send-keys -t customers "java -jar spring-petclinic-customer*.jar" C-m
 EOF
\ No newline at end of file
diff --git a/cdk/ec2/lib/user-data/pet-clinic-frontend-user-data.sh b/cdk/ec2/lib/user-data/pet-clinic-frontend-user-data.sh
index c5fff434..cbf58fd3 100644
--- a/cdk/ec2/lib/user-data/pet-clinic-frontend-user-data.sh
+++ b/cdk/ec2/lib/user-data/pet-clinic-frontend-user-data.sh
@@ -280,7 +280,7 @@ tmux send-keys -t frontend "export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true" C-
 tmux send-keys -t frontend "export OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics" C-m
 tmux send-keys -t frontend "export OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf" C-m
 tmux send-keys -t frontend "export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces" C-m
-tmux send-keys -t frontend "export OTEL_RESOURCE_ATTRIBUTES=\"service.name=${service_name}\"" C-m
+tmux send-keys -t frontend "export OTEL_RESOURCE_ATTRIBUTES=\"service.name=pet-clinic-frontend-ec2-java,Team=Frontend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit\"" C-m
 tmux send-keys -t frontend "export SPRING_PROFILES_ACTIVE=ec2" C-m
 tmux send-keys -t frontend "java -jar spring-petclinic-api-gateway-*.jar" C-m
 
diff --git a/cdk/ec2/lib/user-data/vets-user-data.sh b/cdk/ec2/lib/user-data/vets-user-data.sh
index aa01056b..16d472b2 100644
--- a/cdk/ec2/lib/user-data/vets-user-data.sh
+++ b/cdk/ec2/lib/user-data/vets-user-data.sh
@@ -137,7 +137,7 @@ tmux send-keys -t vets "export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true" C-m
 tmux send-keys -t vets "export OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics" C-m
 tmux send-keys -t vets "export OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf" C-m
 tmux send-keys -t vets "export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces" C-m
-tmux send-keys -t vets "export OTEL_RESOURCE_ATTRIBUTES=\"service.name=${service_name}\"" C-m
+tmux send-keys -t vets "export OTEL_RESOURCE_ATTRIBUTES=\"service.name=${service_name},Team=Frontend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit\"" C-m
 tmux send-keys -t vets "export SPRING_PROFILES_ACTIVE=ec2" C-m
 tmux send-keys -t vets "java -jar spring-petclinic-vet*.jar" C-m
 EOF
\ No newline at end of file
diff --git a/cdk/ec2/lib/user-data/visits-user-data.sh b/cdk/ec2/lib/user-data/visits-user-data.sh
index 59af0629..79e0ffcc 100644
--- a/cdk/ec2/lib/user-data/visits-user-data.sh
+++ b/cdk/ec2/lib/user-data/visits-user-data.sh
@@ -137,7 +137,7 @@ tmux send-keys -t visits "export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true" C-m
 tmux send-keys -t visits "export OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics" C-m
 tmux send-keys -t visits "export OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf" C-m
 tmux send-keys -t visits "export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces" C-m
-tmux send-keys -t visits "export OTEL_RESOURCE_ATTRIBUTES=\"service.name=${service_name}\"" C-m
+tmux send-keys -t visits "export OTEL_RESOURCE_ATTRIBUTES=\"service.name=${service_name},Team=Frontend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit\"" C-m
 # tmux send-keys -t visits "export SPRING_PROFILES_ACTIVE=ec2" C-m
 tmux send-keys -t visits "java -jar spring-petclinic-visit*.jar" C-m
 EOF
\ No newline at end of file
diff --git a/cdk/ecs/lib/stacks/ecsStack.ts b/cdk/ecs/lib/stacks/ecsStack.ts
index 82d6fb6b..f36eb551 100644
--- a/cdk/ecs/lib/stacks/ecsStack.ts
+++ b/cdk/ecs/lib/stacks/ecsStack.ts
@@ -513,7 +513,7 @@ export class EcsClusterStack extends Stack {
                 OTEL_TRACES_SAMPLER: 'xray',
                 OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: 'http://localhost:4316/v1/traces',
                 OTEL_PROPAGATORS: 'tracecontext,baggage,b3,xray',
-                OTEL_RESOURCE_ATTRIBUTES: `aws.log.group.names=${logGroup.logGroupName},service.name=${serviceName}`,
+                OTEL_RESOURCE_ATTRIBUTES: `aws.log.group.names=${logGroup.logGroupName},service.name=${serviceName},Team=Frontend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit`,
                 OTEL_AWS_APPLICATION_SIGNALS_ENABLED: 'true',
                 OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT: 'http://localhost:4316/v1/metrics',
                 OTEL_METRICS_EXPORTER: 'none',
@@ -628,7 +628,7 @@ export class EcsClusterStack extends Stack {
                 OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: 'http://localhost:4316/v1/traces',
                 OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT: 'http://localhost:4316/v1/metrics',
                 OTEL_AWS_APPLICATION_SIGNALS_ENABLED: 'true',
-                OTEL_RESOURCE_ATTRIBUTES: `service.name=${serviceName}`,
+                OTEL_RESOURCE_ATTRIBUTES: `service.name=${serviceName}, Team=Frontend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit`,
                 OTEL_METRICS_EXPORTER: 'none',
                 OTEL_PYTHON_DISTRO: 'aws_distro',
                 EUREKA_SERVER_URL: `${this.DISCOVERY_SERVER}-DNS.${this.serviceDiscoveryStack.namespace.namespaceName}`,
diff --git a/cdk/eks/lib/manifests/sample-app/api-gateway-deployment.yaml b/cdk/eks/lib/manifests/sample-app/api-gateway-deployment.yaml
index a54716c9..eac5079b 100644
--- a/cdk/eks/lib/manifests/sample-app/api-gateway-deployment.yaml
+++ b/cdk/eks/lib/manifests/sample-app/api-gateway-deployment.yaml
@@ -52,5 +52,7 @@ spec:
               value: "${APP_MONITOR_IDENTITY_POOL_ID}"
             - name: APP_MONITOR_ID
               value: "${APP_MONITOR_ID}"
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: "Team=Backend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit"
       restartPolicy: Always
 status: {}
diff --git a/cdk/eks/lib/manifests/sample-app/billing-service-deployment.yaml b/cdk/eks/lib/manifests/sample-app/billing-service-deployment.yaml
index 3fc9560c..47bc1859 100644
--- a/cdk/eks/lib/manifests/sample-app/billing-service-deployment.yaml
+++ b/cdk/eks/lib/manifests/sample-app/billing-service-deployment.yaml
@@ -41,6 +41,8 @@ spec:
               value: <HOST>
             - name: DB_SERVICE_PORT
               value: '5432'
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: "Team=Backend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit"
           # command: ["sh", "-c"]
           # args: ['manage.py', 'runserver', '0.0.0.0:8000']
           command: ['sh', '-c']
diff --git a/cdk/eks/lib/manifests/sample-app/customers-service-deployment.yaml b/cdk/eks/lib/manifests/sample-app/customers-service-deployment.yaml
index e5938c23..1116699d 100644
--- a/cdk/eks/lib/manifests/sample-app/customers-service-deployment.yaml
+++ b/cdk/eks/lib/manifests/sample-app/customers-service-deployment.yaml
@@ -40,5 +40,8 @@ spec:
           name: customers-service-java
           ports:
             - containerPort: 8081
+          env:
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: "Team=Backend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit"
       restartPolicy: Always
 status: {}
diff --git a/cdk/eks/lib/manifests/sample-app/discovery-server-deployment.yaml b/cdk/eks/lib/manifests/sample-app/discovery-server-deployment.yaml
index 4c376f65..185c4431 100644
--- a/cdk/eks/lib/manifests/sample-app/discovery-server-deployment.yaml
+++ b/cdk/eks/lib/manifests/sample-app/discovery-server-deployment.yaml
@@ -31,6 +31,9 @@ spec:
             - java
             - org.springframework.boot.loader.JarLauncher
           image: 111122223333.dkr.ecr.us-west-2.amazonaws.com/springcommunity/spring-petclinic-discovery-server:latest
+          env: 
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: "Team=Backend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit"
           securityContext:
             runAsNonRoot: true
             allowPrivilegeEscalation: false
diff --git a/cdk/eks/lib/manifests/sample-app/insurance-service-deployment.yaml b/cdk/eks/lib/manifests/sample-app/insurance-service-deployment.yaml
index e326a6ad..69a61ac9 100644
--- a/cdk/eks/lib/manifests/sample-app/insurance-service-deployment.yaml
+++ b/cdk/eks/lib/manifests/sample-app/insurance-service-deployment.yaml
@@ -39,6 +39,8 @@ spec:
               value: <HOST>
             - name: DB_SERVICE_PORT
               value: '5432'
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: "Team=Backend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit"
           # command: ["sh", "-c"]
           # args: ['manage.py', 'runserver', '0.0.0.0:8000']
           command: ['sh', '-c']
diff --git a/cdk/eks/lib/manifests/sample-app/nutrition-service-deployment.yaml b/cdk/eks/lib/manifests/sample-app/nutrition-service-deployment.yaml
index 6f0bdeb9..a83d5d8e 100644
--- a/cdk/eks/lib/manifests/sample-app/nutrition-service-deployment.yaml
+++ b/cdk/eks/lib/manifests/sample-app/nutrition-service-deployment.yaml
@@ -24,6 +24,8 @@ spec:
               value: http://discovery-server:8761/eureka
             - name: MONGO_URI
               value: mongodb://admin:admin@mongodb:27017/
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: "Team=Backend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit"
           ports:
             - containerPort: 3000
           imagePullPolicy: Always
diff --git a/cdk/eks/lib/manifests/sample-app/payment-service-deployment.yaml b/cdk/eks/lib/manifests/sample-app/payment-service-deployment.yaml
index 24423db9..5a6cc5c8 100644
--- a/cdk/eks/lib/manifests/sample-app/payment-service-deployment.yaml
+++ b/cdk/eks/lib/manifests/sample-app/payment-service-deployment.yaml
@@ -34,6 +34,8 @@ spec:
               value: "true"
             - name: eureka__instance__port
               value: "8089"
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: "Team=Backend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit"
 
           ports:
             - containerPort: 8089
diff --git a/cdk/eks/lib/manifests/sample-app/vets-service-deployment.yaml b/cdk/eks/lib/manifests/sample-app/vets-service-deployment.yaml
index 924a5554..420fb125 100644
--- a/cdk/eks/lib/manifests/sample-app/vets-service-deployment.yaml
+++ b/cdk/eks/lib/manifests/sample-app/vets-service-deployment.yaml
@@ -34,6 +34,9 @@ spec:
             - java
             - org.springframework.boot.loader.JarLauncher
           image: 111122223333.dkr.ecr.us-west-2.amazonaws.com/springcommunity/spring-petclinic-vets-service:latest
+          env: 
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: "Team=Backend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit"
           securityContext:
             runAsNonRoot: true
             allowPrivilegeEscalation: false
diff --git a/cdk/eks/lib/manifests/sample-app/visits-service-deployment.yaml b/cdk/eks/lib/manifests/sample-app/visits-service-deployment.yaml
index 14813788..f5b77a2e 100644
--- a/cdk/eks/lib/manifests/sample-app/visits-service-deployment.yaml
+++ b/cdk/eks/lib/manifests/sample-app/visits-service-deployment.yaml
@@ -36,6 +36,8 @@ spec:
           env:
             - name: OTEL_INSTRUMENTATION_AWS_SDK_EXPERIMENTAL_SPAN_ATTRIBUTES
               value: "true"
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: "Team=Backend,Organization=Marketplace,BusinessUnit=E-commerce,aws.application_signals.metric_resource_keys=Team&Organization&BusinessUnit"
           image: 111122223333.dkr.ecr.us-west-2.amazonaws.com/springcommunity/spring-petclinic-visits-service:latest
           securityContext:
             runAsNonRoot: true