diff --git a/apps/hcdc-access-service/scripts/database/replicate-dev.sh b/apps/hcdc-access-service/scripts/database/replicate-dev.sh
index 0e58db4f..9e38475c 100755
--- a/apps/hcdc-access-service/scripts/database/replicate-dev.sh
+++ b/apps/hcdc-access-service/scripts/database/replicate-dev.sh
@@ -1,4 +1,4 @@
 rm -f hcdc.bak
-mongodump --uri="mongodb://root:conculan@mongodb-0.mongodb-headless.diut.svc.cluster.local:27017,mongodb-1.mongodb-headless.diut.svc.cluster.local:27017,mongodb-2.mongodb-headless.diut.svc.cluster.local:27017/?retryWrites=true&loadBalanced=false&replicaSet=rs0&readPreference=primary&serverSelectionTimeoutMS=5000&connectTimeoutMS=10000&authSource=admin&authMechanism=SCRAM-SHA-256" --archive="hcdc.bak" --db=hcdc
-mongorestore --uri="mongodb://root:conculan@mongodb-0.mongodb-headless.diut.svc.cluster.local:27017,mongodb-1.mongodb-headless.diut.svc.cluster.local:27017,mongodb-2.mongodb-headless.diut.svc.cluster.local:27017/?retryWrites=true&loadBalanced=false&replicaSet=rs0&readPreference=primary&serverSelectionTimeoutMS=5000&connectTimeoutMS=10000&authSource=admin&authMechanism=SCRAM-SHA-256" --archive="hcdc.bak" --nsFrom="hcdc.*" --nsTo="hcdc-dev.*"
+mongodump --uri="mongodb://root:conculan@mongodb-0.mongodb-headless.infra.svc.cluster.local:27017,mongodb-1.mongodb-headless.infra.svc.cluster.local:27017,mongodb-2.mongodb-headless.infra.svc.cluster.local:27017/?retryWrites=true&loadBalanced=false&replicaSet=rs0&readPreference=primary&serverSelectionTimeoutMS=5000&connectTimeoutMS=10000&authSource=admin&authMechanism=SCRAM-SHA-256" --archive="hcdc.bak" --db=hcdc
+mongorestore --uri="mongodb://root:conculan@mongodb-0.mongodb-headless.infra.svc.cluster.local:27017,mongodb-1.mongodb-headless.infra.svc.cluster.local:27017,mongodb-2.mongodb-headless.infra.svc.cluster.local:27017/?retryWrites=true&loadBalanced=false&replicaSet=rs0&readPreference=primary&serverSelectionTimeoutMS=5000&connectTimeoutMS=10000&authSource=admin&authMechanism=SCRAM-SHA-256" --archive="hcdc.bak" --nsFrom="hcdc.*" --nsTo="hcdc-dev.*"
 rm hcdc.bak
\ No newline at end of file
diff --git a/k8s/dependencies/7-envoy-gateway/templates/gateway-external.yaml b/k8s/dependencies/7-envoy-gateway/templates/gateway-external.yaml
index 90e3f5f3..1ad995ee 100644
--- a/k8s/dependencies/7-envoy-gateway/templates/gateway-external.yaml
+++ b/k8s/dependencies/7-envoy-gateway/templates/gateway-external.yaml
@@ -15,12 +15,17 @@ spec:
         name: gateway-external
   telemetry:
     tracing:
+      samplingRate: 100
       provider:
         type: OpenTelemetry
-        backendRefs:
-          - name: tempo-distributor
-            namespace: observability
-            port: 4317
+        host: tempo-distributor.observability.svc.cluster.local
+        port: 4317
+      customTags:
+        forwarded.request.ip:
+          type: RequestHeader
+          requestHeader:
+            name: X-Forwarded-For
+            defaultValue: "-"
 ---
 kind: GatewayClass
 apiVersion: gateway.networking.k8s.io/v1
diff --git a/k8s/dependencies/7-envoy-gateway/templates/gateway-internal.yaml b/k8s/dependencies/7-envoy-gateway/templates/gateway-internal.yaml
index 810d3261..57997482 100644
--- a/k8s/dependencies/7-envoy-gateway/templates/gateway-internal.yaml
+++ b/k8s/dependencies/7-envoy-gateway/templates/gateway-internal.yaml
@@ -14,12 +14,11 @@ spec:
         name: gateway-internal
   telemetry:
     tracing:
+      samplingRate: 100
       provider:
         type: OpenTelemetry
-        backendRefs:
-          - name: tempo-distributor
-            namespace: observability
-            port: 4317
+        host: tempo-distributor.observability.svc.cluster.local
+        port: 4317
 ---
 kind: GatewayClass
 apiVersion: gateway.networking.k8s.io/v1