diff --git a/aws/eks/cloudwatch_alarms.tf b/aws/eks/cloudwatch_alarms.tf
index 4670222b0..d3888f7a1 100644
--- a/aws/eks/cloudwatch_alarms.tf
+++ b/aws/eks/cloudwatch_alarms.tf
@@ -176,7 +176,7 @@ resource "aws_cloudwatch_metric_alarm" "admin-pods-high-cpu-warning" {
   treat_missing_data        = "missing"
   dimensions = {
     Namespace   = "notification-canada-ca"
-    Service     = "notify-admin"
+    Service     = var.env == "production" ? "admin" : "notify-admin"
     ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
   }
 }
@@ -197,7 +197,7 @@ resource "aws_cloudwatch_metric_alarm" "api-pods-high-cpu-warning" {
   treat_missing_data        = "missing"
   dimensions = {
     Namespace   = "notification-canada-ca"
-    Service     = "notify-api"
+    Service     = var.env == "production" ? "api" : "notify-api"
     ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
   }
 }
@@ -218,7 +218,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-primary-pods-high-cpu-warning" {
   treat_missing_data        = "missing"
   dimensions = {
     Namespace   = "notification-canada-ca"
-    Service     = "notify-celery-primary"
+    Service     = var.env == "production" ? "celery-primary" : "notify-celery-primary"
     ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
   }
 }
@@ -239,7 +239,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-scalable-pods-high-cpu-warning" {
   treat_missing_data        = "missing"
   dimensions = {
     Namespace   = "notification-canada-ca"
-    Service     = "notify-celery-scalable"
+    Service     = var.env == "production" ? "celery-scalable" : "notify-celery-scalable"
     ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
   }
 }
@@ -260,7 +260,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-sms-pods-high-cpu-warning" {
   treat_missing_data        = "missing"
   dimensions = {
     Namespace   = "notification-canada-ca"
-    Service     = "notify-celery-sms"
+    Service     = var.env == "production" ? "celery-sms" : "notify-celery-sms"
     ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
   }
 }
@@ -282,7 +282,7 @@ resource "aws_cloudwatch_metric_alarm" "admin-pods-high-memory-warning" {
   treat_missing_data        = "missing"
   dimensions = {
     Namespace   = "notification-canada-ca"
-    Service     = "notify-admin"
+    Service     = var.env == "production" ? "admin" : "notify-admin"
     ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
   }
 }
@@ -303,7 +303,7 @@ resource "aws_cloudwatch_metric_alarm" "api-pods-high-memory-warning" {
   treat_missing_data        = "missing"
   dimensions = {
     Namespace   = "notification-canada-ca"
-    Service     = "notify-api"
+    Service     = var.env == "production" ? "api" : "notify-api"
     ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
   }
 }
@@ -324,7 +324,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-primary-pods-high-memory-warning"
   treat_missing_data        = "missing"
   dimensions = {
     Namespace   = "notification-canada-ca"
-    Service     = "notify-celery-primary"
+    Service     = var.env == "production" ? "celery-primary" : "notify-celery-primary"
     ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
   }
 }
@@ -345,7 +345,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-sms-pods-high-memory-warning" {
   treat_missing_data        = "missing"
   dimensions = {
     Namespace   = "notification-canada-ca"
-    Service     = "notify-celery-sms"
+    Service     = var.env == "production" ? "celery-sms" : "notify-celery-sms"
     ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
   }
 }
@@ -478,7 +478,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-primary-replicas-unavailable" {
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-celery-primary"
+        deployment  = var.env == "production" ? "celery-primary" : "notify-celery-primary"
       }
     }
   }
@@ -507,7 +507,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-scalable-replicas-unavailable" {
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-celery-scalable"
+        deployment  = var.env == "production" ? "celery-scalable" : "notify-celery-scalable"
       }
     }
   }
@@ -535,7 +535,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-beat-replicas-unavailable" {
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-celery-beat"
+        deployment  = var.env == "production" ? "celery-beat" : "notify-celery-beat"
       }
     }
   }
@@ -563,7 +563,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-sms-replicas-unavailable" {
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-celery-sms"
+        deployment  = var.env == "production" ? "celery-sms" : "notify-celery-sms"
       }
     }
   }
@@ -591,7 +591,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-email-send-primary-replicas-unava
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-celery-email-send-primary"
+        deployment  = var.env == "production" ? "celery-email-send-primary" : "notify-celery-email-send-primary"
       }
     }
   }
@@ -620,7 +620,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-email-send-scalable-replicas-unav
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-celery-email-send-scalable"
+        deployment  = var.env == "production" ? "celery-email-send-scalable" : "notify-celery-email-send-scalable"
       }
     }
   }
@@ -648,7 +648,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-sms-send-primary-replicas-unavail
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-celery-sms-send-primary"
+        deployment  = var.env == "production" ? "celery-sms-send-primary" : "notify-celery-sms-send-primary"
       }
     }
   }
@@ -677,7 +677,7 @@ resource "aws_cloudwatch_metric_alarm" "celery-sms-send-scalable-replicas-unavai
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-celery-sms-send-scalable"
+        deployment  = var.env == "production" ? "celery-sms-send-scalable" : "notify-celery-sms-send-scalable"
       }
     }
   }
@@ -705,7 +705,7 @@ resource "aws_cloudwatch_metric_alarm" "admin-replicas-unavailable" {
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-admin"
+        deployment  = var.env == "production" ? "admin" : "notify-admin"
       }
     }
   }
@@ -733,7 +733,7 @@ resource "aws_cloudwatch_metric_alarm" "api-replicas-unavailable" {
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-api"
+        deployment  = var.env == "production" ? "api" : "notify-api"
       }
     }
   }
@@ -761,7 +761,7 @@ resource "aws_cloudwatch_metric_alarm" "documentation-replicas-unavailable" {
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-documentation"
+        deployment  = var.env == "production" ? "documentation" : "notify-documentation"
       }
     }
   }
@@ -789,7 +789,7 @@ resource "aws_cloudwatch_metric_alarm" "document-download-api-replicas-unavailab
       dimensions = {
         ClusterName = aws_eks_cluster.notification-canada-ca-eks-cluster.name
         namespace   = var.notify_k8s_namespace
-        deployment  = "notify-document-download"
+        deployment  = var.env == "production" ? "document-download" : "notify-document-download"
       }
     }
   }
diff --git a/aws/eks/cloudwatch_log.tf b/aws/eks/cloudwatch_log.tf
index 08b72c95a..d6e84a3ed 100644
--- a/aws/eks/cloudwatch_log.tf
+++ b/aws/eks/cloudwatch_log.tf
@@ -98,7 +98,7 @@ resource "aws_cloudwatch_log_metric_filter" "bounce-rate-critical" {
 resource "aws_cloudwatch_log_metric_filter" "api-evicted-pods" {
   count          = var.cloudwatch_enabled ? 1 : 0
   name           = "api-evicted-pods"
-  pattern        = "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-api-*\") }"
+  pattern        = var.env == "production" ? "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"api-*\") }" : "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-api-*\") }"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-prometheus-logs[0].name
 
   metric_transformation {
@@ -111,7 +111,7 @@ resource "aws_cloudwatch_log_metric_filter" "api-evicted-pods" {
 resource "aws_cloudwatch_log_metric_filter" "celery-evicted-pods" {
   count          = var.cloudwatch_enabled ? 1 : 0
   name           = "celery-evicted-pods"
-  pattern        = "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-celery-*\") }"
+  pattern        = var.env == "production" ? "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"celery-*\") }" : "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-celery-*\") }"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-prometheus-logs[0].name
 
   metric_transformation {
@@ -124,7 +124,7 @@ resource "aws_cloudwatch_log_metric_filter" "celery-evicted-pods" {
 resource "aws_cloudwatch_log_metric_filter" "admin-evicted-pods" {
   count          = var.cloudwatch_enabled ? 1 : 0
   name           = "admin-evicted-pods"
-  pattern        = "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-admin-*\") }"
+  pattern        = var.env == "production" ? "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"admin-*\") }" : "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-admin-*\") }"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-prometheus-logs[0].name
 
   metric_transformation {
@@ -137,7 +137,7 @@ resource "aws_cloudwatch_log_metric_filter" "admin-evicted-pods" {
 resource "aws_cloudwatch_log_metric_filter" "document-download-evicted-pods" {
   count          = var.cloudwatch_enabled ? 1 : 0
   name           = "document-download-evicted-pods"
-  pattern        = "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-document-download-*\") }"
+  pattern        = var.env == "production" ? "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"document-download-*\") }" : "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-document-download-*\") }"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-prometheus-logs[0].name
 
   metric_transformation {
@@ -150,7 +150,7 @@ resource "aws_cloudwatch_log_metric_filter" "document-download-evicted-pods" {
 resource "aws_cloudwatch_log_metric_filter" "documentation-evicted-pods" {
   count          = var.cloudwatch_enabled ? 1 : 0
   name           = "documentation-evicted-pods"
-  pattern        = "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-documentation-*\") }"
+  pattern        = var.env == "production" ? "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"documentation-*\") }" : "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-documentation-*\") }"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-prometheus-logs[0].name
 
   metric_transformation {
diff --git a/aws/eks/cloudwatch_queries.tf b/aws/eks/cloudwatch_queries.tf
index d3e7f707a..c3e90c2df 100644
--- a/aws/eks/cloudwatch_queries.tf
+++ b/aws/eks/cloudwatch_queries.tf
@@ -1,3 +1,12 @@
+locals {
+  celery_name            = var.env == "production" ? "celery" : "notify-celery"
+  admin_name             = var.env == "production" ? "admin" : "notify-admin"
+  api_name               = var.env == "production" ? "api" : "notify-api"
+  document_download_name = var.env == "production" ? "document-download" : "notify-document-download"
+  documentation_name     = var.env == "production" ? "documentation" : "notify-documentation"
+
+}
+
 ################################ CELERY FOLDER ################################
 
 resource "aws_cloudwatch_query_definition" "celery-errors" {
@@ -10,7 +19,7 @@ resource "aws_cloudwatch_query_definition" "celery-errors" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /^notify-celery/
+| filter kubernetes.container_name like /^${local.celery_name}/
 | filter @message like /ERROR\/.*Worker/ or @message like /ERROR\/MainProcess/
 | sort @timestamp desc
 | limit 20
@@ -27,7 +36,7 @@ resource "aws_cloudwatch_query_definition" "celery-filter-by-job" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.labels.app as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.labels.app like /^notify-celery/
+| filter kubernetes.labels.app like /^${local.celery_name}/
 | filter @message like /0d58e195-d6ae-4fe3-aa73-064ff106972b/
 | sort @timestamp desc
 | limit 20
@@ -44,7 +53,7 @@ resource "aws_cloudwatch_query_definition" "celery-filter-by-notification-id" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /^notify-celery/
+| filter kubernetes.container_name like /^${local.celery_name}/
 | filter @message like /notification_id/
 | sort @timestamp desc
 | limit 20
@@ -93,7 +102,7 @@ resource "aws_cloudwatch_query_definition" "celery-queues" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.labels.app as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.labels.app like /^notify-celery/
+| filter kubernetes.labels.app like /^${local.celery_name}/
 | filter @message like /queue for delivery/
 | sort @timestamp desc
 | limit 20
@@ -110,7 +119,7 @@ resource "aws_cloudwatch_query_definition" "celery-starts" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.labels.app as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /^notify-celery/
+| filter kubernetes.container_name like /^${local.celery_name}/
 | filter @message like /Notify config/
 | sort @timestamp desc
 | stats count
@@ -127,7 +136,7 @@ resource "aws_cloudwatch_query_definition" "celery-worker-exited-normally" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /^notify-celery/
+| filter kubernetes.container_name like /^${local.celery_name}/
 | filter @message like /Warm shutdown/
 | sort @timestamp desc
 QUERY
@@ -143,7 +152,7 @@ resource "aws_cloudwatch_query_definition" "celery-worker-exited-prematurely" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /^notify-celery/
+| filter kubernetes.container_name like /^${local.celery_name}/
 | filter @message like /Task handler raised error: WorkerLostError\('Worker exited prematurely/
 | sort @timestamp desc
 QUERY
@@ -159,7 +168,7 @@ resource "aws_cloudwatch_query_definition" "celery-worker-exits-cold-vs-warm" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /^notify-celery/
+| filter kubernetes.container_name like /^${local.celery_name}/
 | parse "Warm shutdown" as @warm
 | parse "Worker exited prematurely" as @cold
 | filter ispresent(@warm) or ispresent(@cold)
@@ -177,7 +186,7 @@ resource "aws_cloudwatch_query_definition" "retry-attemps-by-duration" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /^notify-celery/
+| filter kubernetes.container_name like /^${local.celery_name}/
 | filter @message like /Retry in/
 | parse @message /Retry in (?<retry_duration>\d+s)/
 | stats count() by retry_duration
@@ -196,7 +205,7 @@ resource "aws_cloudwatch_query_definition" "admin-50X-errors" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /notify-admin/
+| filter kubernetes.container_name like /${local.admin_name}/
 | filter @message like /HTTP\/\d+\.\d+\\" 50\d/
 | sort @timestamp desc
 | limit 20
@@ -213,7 +222,7 @@ resource "aws_cloudwatch_query_definition" "api-50X-errors" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /notify-api/
+| filter kubernetes.container_name like /${local.api_name}/
 | filter @message like /HTTP\/\d+\.\d+\\" 50\d/
 | sort @timestamp desc
 | limit 20
@@ -230,7 +239,7 @@ resource "aws_cloudwatch_query_definition" "bounce-rate-critical" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /^notify-celery-email-send-*/
+| filter kubernetes.container_name like /^${local.celery_name}-email-send-*/
 | filter @message like "critical bounce rate threshold of 10"
 | sort @timestamp desc
 | limit 20
@@ -247,7 +256,7 @@ resource "aws_cloudwatch_query_definition" "bounce-rate-warning" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /^notify-celery-email-send-*/
+| filter kubernetes.container_name like /^${local.celery_name}-email-send-*/
 | filter @message like "warning bounce rate threshold of 5"
 | sort @timestamp desc
 | limit 20
@@ -264,7 +273,7 @@ resource "aws_cloudwatch_query_definition" "bounce-rate-warnings-and-criticals"
 
   query_string = <<QUERY
 fields @timestamp, @service_id, @bounce_type
-| filter kubernetes.container_name like /^notify-celery-email-send-*/
+| filter kubernetes.container_name like /^${local.celery_name}-email-send-*/
 | filter @message like /bounce rate threshold of/
 | parse @message "Service: * has met or exceeded a * bounce rate" as @service_id, @bounce_type
 | stats count(*) by @service_id, @bounce_type
@@ -282,7 +291,7 @@ resource "aws_cloudwatch_query_definition" "callback-errors-by-url" {
 
   query_string = <<QUERY
 fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream
-| filter kubernetes.container_name like /^notify-celery/
+| filter kubernetes.container_name like /^${local.celery_name}/
 | filter @message like /send_delivery_status_to_service request failed for notification_id/
 | parse log "to url: * service: * exc:" as @url, @service_id
 | stats count() as failed_callbacks by @url, @service_id
@@ -300,7 +309,7 @@ resource "aws_cloudwatch_query_definition" "callback-max-retry-failures-by-servi
 
   query_string = <<QUERY
 fields @timestamp, @service_id, @callback_url, @notification_id
-| filter kubernetes.container_name like /^notify-celery/
+| filter kubernetes.container_name like /^${local.celery_name}/
 | filter @message like /send_delivery_status_to_service has retried the max num of times for callback url/
 | parse @message 'Retry: send_delivery_status_to_service has retried the max num of times for callback url * and notification_id: * service: *' as @callback_url, @notification_id, @service_id
 | sort @timestamp desc
@@ -319,7 +328,7 @@ resource "aws_cloudwatch_query_definition" "callback-failures" {
 
   query_string = <<QUERY
 fields @timestamp, @notification_id, @url, @error
-| filter kubernetes.container_name like /^notify-celery/
+| filter kubernetes.container_name like /^${local.celery_name}/
 | filter @message like /send_delivery_status_to_service request failed for notification_id:/
 | parse @message 'send_delivery_status_to_service request failed for notification_id: * and url: * service: * exc: *' as @notification_id, @url, @service_id, @error
 | limit 10000
diff --git a/aws/eks/dashboards.tf b/aws/eks/dashboards.tf
index 3cddc0a55..661adf5ad 100644
--- a/aws/eks/dashboards.tf
+++ b/aws/eks/dashboards.tf
@@ -12,8 +12,8 @@ resource "aws_cloudwatch_dashboard" "notify_system" {
             "type": "metric",
             "properties": {
                 "metrics": [
-                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "deployment", "notify-celery-email-send-primary", { "region": "${var.region}", "label": "notify-celery-email-send-primary" } ],
-                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "deployment", "notify-celery-email-send-scalable", { "region": "${var.region}", "label": "notify-celery-email-send-scalable" } ]
+                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "deployment", "${local.celery_name}-email-send-primary", { "region": "${var.region}", "label": "${local.celery_name}-email-send-primary" } ],
+                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "deployment", "${local.celery_name}-email-send-scalable", { "region": "${var.region}", "label": "${local.celery_name}-email-send-scalable" } ]
                 ],
                 "sparkline": true,
                 "view": "singleValue",
@@ -48,7 +48,7 @@ resource "aws_cloudwatch_dashboard" "notify_system" {
             "x": 8,
             "type": "log",
             "properties": {
-                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | fields @timestamp as Time, kubernetes.container_name as Deployment, log\n| filter kubernetes.container_name like /^notify-celery/\n| filter @message like /ERROR\\/.*Worker/ or @message like /ERROR\\/MainProcess/ \n| sort @timestamp desc\n",
+                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | fields @timestamp as Time, kubernetes.container_name as Deployment, log\n| filter kubernetes.container_name like /^${local.celery_name}/\n| filter @message like /ERROR\\/.*Worker/ or @message like /ERROR\\/MainProcess/ \n| sort @timestamp desc\n",
                 "region": "${var.region}",
                 "stacked": false,
                 "title": "Celery Errors",
@@ -130,10 +130,10 @@ resource "aws_cloudwatch_dashboard" "notify_system" {
             "type": "metric",
             "properties": {
                 "metrics": [
-                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "deployment", "notify-admin", { "label": "notify-admin", "region": "${var.region}", "color": "#69ae34" } ],
-                    [ "...", "notify-document-download", { "region": "${var.region}", "label": "notify-document-download" } ],
-                    [ "...", "notify-documentation", { "region": "${var.region}", "label": "notify-documentation" } ],
-                    [ "...", "notify-api", { "region": "${var.region}", "label": "notify-api-k8s" } ]
+                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "deployment", "${local.admin_name}", { "label": "${local.admin_name}", "region": "${var.region}", "color": "#69ae34" } ],
+                    [ "...", "${local.document_download_name}", { "region": "${var.region}", "label": "${local.document_download_name}" } ],
+                    [ "...", "${local.documentation_name}", { "region": "${var.region}", "label": "${local.documentation_name}" } ],
+                    [ "...", "${local.api_name}", { "region": "${var.region}", "label": "${local.api_name}-k8s" } ]
                 ],
                 "sparkline": true,
                 "view": "singleValue",
@@ -300,7 +300,7 @@ resource "aws_cloudwatch_dashboard" "notify_system" {
             "x": 0,
             "type": "log",
             "properties": {
-                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream\n| filter kubernetes.container_name like /^notify-celery/\n| fields strcontains(@message, 'ERROR') as is_error\n| stats sum(is_error) as errors by bin(1m)\n",
+                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream\n| filter kubernetes.container_name like /^${local.celery_name}/\n| fields strcontains(@message, 'ERROR') as is_error\n| stats sum(is_error) as errors by bin(1m)\n",
                 "region": "${var.region}",
                 "stacked": false,
                 "title": "Celery errors",
@@ -314,7 +314,7 @@ resource "aws_cloudwatch_dashboard" "notify_system" {
             "x": 0,
             "type": "log",
             "properties": {
-                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream\n| filter kubernetes.container_name not like /^notify-celery/\n| fields @message like /HTTP\\/\\d+\\.\\d+\\\\\" 50\\d/ as is_error\n| stats sum(is_error) as errors by bin(1m)\n",
+                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream\n| filter kubernetes.container_name not like /^${local.celery_name}/\n| fields @message like /HTTP\\/\\d+\\.\\d+\\\\\" 50\\d/ as is_error\n| stats sum(is_error) as errors by bin(1m)\n",
                 "region": "${var.region}",
                 "stacked": false,
                 "title": "500s",
@@ -328,7 +328,7 @@ resource "aws_cloudwatch_dashboard" "notify_system" {
             "x": 8,
             "type": "log",
             "properties": {
-                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream\n| filter kubernetes.container_name not like /notify-celery/\n| filter @message like /HTTP\\/\\d+\\.\\d+\\\\\" 50\\d/\n| sort @timestamp desc\n| limit 20\n",
+                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream\n| filter kubernetes.container_name not like /${local.celery_name}/\n| filter @message like /HTTP\\/\\d+\\.\\d+\\\\\" 50\\d/\n| sort @timestamp desc\n| limit 20\n",
                 "region": "${var.region}",
                 "stacked": false,
                 "title": "500s",
@@ -343,8 +343,8 @@ resource "aws_cloudwatch_dashboard" "notify_system" {
             "type": "metric",
             "properties": {
                 "metrics": [
-                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "deployment", "notify-celery-primary", { "region": "${var.region}", "label": "notify-celery-primary" } ],
-                    [ "...", "notify-celery-scalable", { "region": "${var.region}", "label": "notify-celery-scalable" } ]
+                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "deployment", "${local.celery_name}-primary", { "region": "${var.region}", "label": "${local.celery_name}-primary" } ],
+                    [ "...", "${local.celery_name}-scalable", { "region": "${var.region}", "label": "${local.celery_name}-scalable" } ]
                 ],
                 "sparkline": true,
                 "view": "singleValue",
@@ -362,8 +362,8 @@ resource "aws_cloudwatch_dashboard" "notify_system" {
             "type": "metric",
             "properties": {
                 "metrics": [
-                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "deployment", "notify-celery-sms-send-primary", { "region": "${var.region}", "label": "notify-celery-sms-send-primary" } ],
-                    [ "...", "notify-celery-sms-send-scalable", { "region": "${var.region}", "label": "notify-celery-sms-send-scalable" } ]
+                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "deployment", "${local.celery_name}-sms-send-primary", { "region": "${var.region}", "label": "${local.celery_name}-sms-send-primary" } ],
+                    [ "...", "${local.celery_name}-sms-send-scalable", { "region": "${var.region}", "label": "${local.celery_name}-sms-send-scalable" } ]
                 ],
                 "sparkline": true,
                 "view": "singleValue",
@@ -550,7 +550,7 @@ resource "aws_cloudwatch_dashboard" "notify_system" {
             "x": 0,
             "type": "log",
             "properties": {
-                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | filter kubernetes.container_name like /^notify-celery/\n| filter @message like /send_delivery_status_to_service request failed for notification_id/\n| parse log \"to url: https://* service: * exc: * \" as endpoint, service_id, error\n| stats count() as fails by service_id, endpoint, error\n| display fails, service_id, error, endpoint\n| order by fails desc\n",
+                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | filter kubernetes.container_name like /^${local.celery_name}/\n| filter @message like /send_delivery_status_to_service request failed for notification_id/\n| parse log \"to url: https://* service: * exc: * \" as endpoint, service_id, error\n| stats count() as fails by service_id, endpoint, error\n| display fails, service_id, error, endpoint\n| order by fails desc\n",
                 "region": "${var.region}",
                 "stacked": false,
                 "title": "Failed Service Callbacks",
@@ -919,7 +919,7 @@ resource "aws_cloudwatch_dashboard" "errors" {
             "x": 0,
             "type": "log",
             "properties": {
-                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | fields @timestamp, log, kubernetes.labels.app as app, kubernetes.pod_name as pod_name, @logStream\n| filter kubernetes.labels.app like /^notify-celery/\n| filter @message like /ERROR\\/.*Worker/\n| sort @timestamp desc\n| limit 20\n",
+                "query": "SOURCE '/aws/containerinsights/${aws_eks_cluster.notification-canada-ca-eks-cluster.name}/application' | fields @timestamp, log, kubernetes.labels.app as app, kubernetes.pod_name as pod_name, @logStream\n| filter kubernetes.labels.app like /^${local.celery_name}/\n| filter @message like /ERROR\\/.*Worker/\n| sort @timestamp desc\n| limit 20\n",
                 "region": "${var.region}",
                 "title": "Celery errors",
                 "view": "table"
@@ -1021,10 +1021,10 @@ resource "aws_cloudwatch_dashboard" "kubernetes" {
             "type": "metric",
             "properties": {
                 "metrics": [
-                    [ "ContainerInsights", "pod_memory_utilization_over_pod_limit", "PodName", "notify-admin", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "Namespace", "notification-canada-ca" ],
-                    [ "...", "notify-api", ".", ".", ".", "." ],
-                    [ "...", "notify-celery", ".", ".", ".", "." ],
-                    [ "...", "notify-document-download", ".", ".", ".", "." ]
+                    [ "ContainerInsights", "pod_memory_utilization_over_pod_limit", "PodName", "${local.admin_name}", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "Namespace", "notification-canada-ca" ],
+                    [ "...", "${local.api_name}", ".", ".", ".", "." ],
+                    [ "...", "${local.celery_name}", ".", ".", ".", "." ],
+                    [ "...", "${local.document_download_name}", ".", ".", ".", "." ]
                 ],
                 "view": "timeSeries",
                 "stacked": false,
@@ -1053,12 +1053,12 @@ resource "aws_cloudwatch_dashboard" "kubernetes" {
             "type": "metric",
             "properties": {
                 "metrics": [
-                    [ "ContainerInsights", "pod_cpu_utilization", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "Service", "notify-api", "Namespace", "notification-canada-ca", { "yAxis": "right", "stat": "Average" } ],
-                    [ "...", "notify-celery", ".", ".", { "yAxis": "right", "stat": "Average" } ],
-                    [ "...", "notify-admin", ".", ".", { "stat": "Average", "yAxis": "right" } ],
-                    [ ".", "service_number_of_running_pods", ".", ".", ".", "notify-celery", ".", ".", { "yAxis": "left" } ],
-                    [ "...", "notify-api", ".", ".", { "yAxis": "left" } ],
-                    [ "...", "notify-admin", ".", "." ]
+                    [ "ContainerInsights", "pod_cpu_utilization", "ClusterName", "${aws_eks_cluster.notification-canada-ca-eks-cluster.name}", "Service", "${local.api_name}", "Namespace", "notification-canada-ca", { "yAxis": "right", "stat": "Average" } ],
+                    [ "...", "${local.celery_name}", ".", ".", { "yAxis": "right", "stat": "Average" } ],
+                    [ "...", "${local.admin_name}", ".", ".", { "stat": "Average", "yAxis": "right" } ],
+                    [ ".", "service_number_of_running_pods", ".", ".", ".", "${local.celery_name}", ".", ".", { "yAxis": "left" } ],
+                    [ "...", "${local.api_name}", ".", ".", { "yAxis": "left" } ],
+                    [ "...", "${local.admin_name}", ".", "." ]
                 ],
                 "view": "timeSeries",
                 "stacked": false,
diff --git a/aws/pinpoint_to_sqs_sms_callbacks/dashboards.tf b/aws/pinpoint_to_sqs_sms_callbacks/dashboards.tf
index 9a2ec3af2..4d8afb509 100644
--- a/aws/pinpoint_to_sqs_sms_callbacks/dashboards.tf
+++ b/aws/pinpoint_to_sqs_sms_callbacks/dashboards.tf
@@ -1,3 +1,7 @@
+locals {
+  celery_name = var.env == "production" ? "celery" : "${local.celery_name}"
+}
+
 resource "aws_cloudwatch_dashboard" "pinpoint" {
   count          = var.cloudwatch_enabled ? 1 : 0
   dashboard_name = "SMS-Pinpoint"
@@ -591,8 +595,8 @@ resource "aws_cloudwatch_dashboard" "sms-send-rate" {
             "type": "metric",
             "properties": {
                 "metrics": [
-                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "notification-canada-ca-${var.env}-eks-cluster", "deployment", "notify-celery-sms-send-primary", { "region": "${var.region}", "label": "notify-celery-sms-send-primary" } ],
-                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "notification-canada-ca-${var.env}-eks-cluster", "deployment", "notify-celery-sms-send-scalable", { "region": "${var.region}", "label": "notify-celery-sms-send-scalable" } ]
+                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "notification-canada-ca-${var.env}-eks-cluster", "deployment", "${local.celery_name}-sms-send-primary", { "region": "${var.region}", "label": "${local.celery_name}-sms-send-primary" } ],
+                    [ "ContainerInsights/Prometheus", "kube_deployment_status_replicas_available", "namespace", "notification-canada-ca", "ClusterName", "notification-canada-ca-${var.env}-eks-cluster", "deployment", "${local.celery_name}-sms-send-scalable", { "region": "${var.region}", "label": "${local.celery_name}-sms-send-scalable" } ]
                 ],
                 "sparkline": true,
                 "view": "singleValue",
@@ -633,7 +637,7 @@ resource "aws_cloudwatch_dashboard" "sms-send-rate" {
             "x": 0,
             "type": "log",
             "properties": {
-                "query": "SOURCE '/aws/containerinsights/notification-canada-ca-${var.env}-eks-cluster/application' | fields @timestamp as Time, kubernetes.container_name as Deployment, log\n| filter kubernetes.container_name like /^notify-celery-sms-send/\n| filter @message like /ERROR\\/.*Worker/ or @message like /ERROR\\/MainProcess/ \n| sort @timestamp desc\n",
+                "query": "SOURCE '/aws/containerinsights/notification-canada-ca-${var.env}-eks-cluster/application' | fields @timestamp as Time, kubernetes.container_name as Deployment, log\n| filter kubernetes.container_name like /^${local.celery_name}-sms-send/\n| filter @message like /ERROR\\/.*Worker/ or @message like /ERROR\\/MainProcess/ \n| sort @timestamp desc\n",
                 "region": "${var.region}",
                 "stacked": false,
                 "title": "SMS Sending Celery Errors",
@@ -647,7 +651,7 @@ resource "aws_cloudwatch_dashboard" "sms-send-rate" {
             "x": 16,
             "type": "log",
             "properties": {
-                "query": "SOURCE '/aws/containerinsights/notification-canada-ca-${var.env}-eks-cluster/application' | fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream\n| filter kubernetes.container_name like /^notify-celery-sms/\n| filter @message like /succeeded/\n| fields strcontains(@message, 'Task deliver_throttled_sms') as is_throttled_sms\n| fields strcontains(@message, 'Task deliver_sms') as is_normal_sms\n| stats sum(is_normal_sms) as normal_sms, sum(is_throttled_sms) as throttled_sms by bin(1m)",
+                "query": "SOURCE '/aws/containerinsights/notification-canada-ca-${var.env}-eks-cluster/application' | fields @timestamp, log, kubernetes.container_name as app, kubernetes.pod_name as pod_name, @logStream\n| filter kubernetes.container_name like /^${local.celery_name}-sms/\n| filter @message like /succeeded/\n| fields strcontains(@message, 'Task deliver_throttled_sms') as is_throttled_sms\n| fields strcontains(@message, 'Task deliver_sms') as is_normal_sms\n| stats sum(is_normal_sms) as normal_sms, sum(is_throttled_sms) as throttled_sms by bin(1m)",
                 "queryLanguage": "LOGSQL",
                 "region": "${var.region}",
                 "title": "Normal vs Throttled SMS",