diff --git a/README.md b/README.md
index a2a09f4..246678b 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Developer NOTE: We should automate this configuration.
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | The namespace into which tempo will be deployed | `string` | `"tempo"` | no |
 | <a name="input_oidc_provider_arn"></a> [oidc\_provider\_arn](#input\_oidc\_provider\_arn) | The ARN in the EKS cluster for the OpenID Connect identity provider. | `string` | n/a | yes |
 | <a name="input_profile"></a> [profile](#input\_profile) | AWS config profile used to upload images into ECR | `string` | `""` | no |
-| <a name="input_prometheus_namespace"></a> [prometheus\_namespace](#input\_prometheus\_namespace) | Namespace where Prometheus is installed. | `string` | `"prometheus"` | no |
+| <a name="input_prometheus_namespace"></a> [prometheus\_namespace](#input\_prometheus\_namespace) | Namespace where Prometheus is installed. | `string` | `"telemetry"` | no |
 | <a name="input_prometheus_port"></a> [prometheus\_port](#input\_prometheus\_port) | Port number of Prometheus service, mostly either 80 or 9090 | `string` | `"80"` | no |
 | <a name="input_prometheus_svc"></a> [prometheus\_svc](#input\_prometheus\_svc) | Prometheus service name. | `string` | `"prometheus-server"` | no |
 | <a name="input_region"></a> [region](#input\_region) | The region holding these resources (for the s3 bucket.) | `string` | n/a | yes |
diff --git a/main.tf b/main.tf
index eb4ff92..e75b75c 100644
--- a/main.tf
+++ b/main.tf
@@ -41,6 +41,7 @@ module "tempo-irsa-role" {
 # Helm Chart for Tempo
 ################################################################################
 resource "helm_release" "tempo" {
+  depends_on       = [module.tempo-irsa-role, module.images, module.tempo_s3]
   chart            = "tempo"
   version          = var.tempo_chart_version
   name             = "tempo"
@@ -51,16 +52,18 @@ resource "helm_release" "tempo" {
   wait             = true
   timeout          = 300
 
-  set = [{
-    name  = "replicas"
-    value = "1"
+  set = [
+    {
+      name  = "replicas"
+      value = "1"
+    },
+    {
+      name  = "tempo.registry"
+      value = module.images.images[local.tempo_key].dest_registry
     },
     {
-      name = "tempo.repository"
-      value = format("%v/%v",
-        module.images.images[local.tempo_key].dest_registry,
-        module.images.images[local.tempo_key].dest_repository
-      )
+      name  = "tempo.repository"
+      value = module.images.images[local.tempo_key].dest_repository
     },
     {
       name  = "tempo.tag"
@@ -80,7 +83,7 @@ resource "helm_release" "tempo" {
     },
     {
       name  = "tempo.metricsGenerator.remoteWriteUrl"
-      value = "http://${var.prometheus_svc}.${var.prometheus_namespace}:${var.prometheus_port}/api/v1/write"
+      value = "http://${var.prometheus_svc}.${var.prometheus_namespace}.svc.cluster.local:${var.prometheus_port}/api/v1/write"
     },
     {
       name  = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn"
diff --git a/tempo_values.yaml b/tempo_values.yaml
index 5b2e47b..3494f11 100644
--- a/tempo_values.yaml
+++ b/tempo_values.yaml
@@ -16,7 +16,7 @@ tempo:
       value: "9411"
   metricsGenerator:
     enabled: true
-    remoteWriteUrl: http://prometheus-server.prometheus:80/api/v1/write
+    remoteWriteUrl: "http://prometheus-server.telemetry.svc.cluster.local:80/api/v1/write"
   reportingEnabled: false
 
 serviceAccount:
diff --git a/variables.tf b/variables.tf
index dc41667..4b6197d 100644
--- a/variables.tf
+++ b/variables.tf
@@ -45,7 +45,7 @@ variable "profile" {
 variable "prometheus_namespace" {
   description = "Namespace where Prometheus is installed."
   type        = string
-  default     = "prometheus"
+  default     = "telemetry"
 }
 
 variable "prometheus_port" {