diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 01aea517..4b5f679e 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -159,7 +159,6 @@ jobs:
           TF_VAR_jwt_secret: ${{ secrets.PROD_JWT_SECRET }}
           TF_VAR_image_version: ${{ inputs.image_tag }}
           TF_VAR_relay_public_key: ${{ secrets.RELAY_PUBLIC_KEY }}
-          TF_VAR_notification_channels: NNOynGwVz
         with:
           environment: "prod"
 
diff --git a/terraform/monitoring/main.tf b/terraform/monitoring/main.tf
index 6c27eb60..069dc25a 100644
--- a/terraform/monitoring/main.tf
+++ b/terraform/monitoring/main.tf
@@ -133,7 +133,7 @@ resource "grafana_dashboard" "at_a_glance_old" {
               "type" : "prometheus",
               "uid" : grafana_data_source.prometheus.uid
             },
-            "expr" : "sum(rate(received_notifications{}[1h]))",
+            "expr" : "sum(rate(received_notifications_total{}[1h]))",
             "legendFormat" : "__auto",
             "refId" : "Received"
           },
@@ -143,7 +143,7 @@ resource "grafana_dashboard" "at_a_glance_old" {
               "uid" : grafana_data_source.prometheus.uid
             },
             "editorMode" : "code",
-            "expr" : "sum(increase(sent_apns_notifications{}[1h]))",
+            "expr" : "sum(increase(sent_apns_notifications_total{}[1h]))",
             "hide" : false,
             "legendFormat" : "__auto",
             "range" : true,
@@ -155,7 +155,7 @@ resource "grafana_dashboard" "at_a_glance_old" {
               "uid" : grafana_data_source.prometheus.uid
             },
             "editorMode" : "code",
-            "expr" : "sum(increase(sent_fcm_notifications{}[1h]))",
+            "expr" : "sum(increase(sent_fcm_notifications_total{}[1h]))",
             "hide" : false,
             "legendFormat" : "__auto",
             "range" : true,
@@ -278,7 +278,7 @@ resource "grafana_dashboard" "at_a_glance_old" {
               "uid" : grafana_data_source.prometheus.uid
             },
             "exemplar" : true,
-            "expr" : "sum(increase(received_notifications{}[1h]))",
+            "expr" : "sum(increase(received_notifications_total{}[1h]))",
             "format" : "time_series",
             "interval" : "",
             "legendFormat" : "",
diff --git a/terraform/vars/prod.tfvars b/terraform/vars/prod.tfvars
index e69de29b..2a7a8935 100644
--- a/terraform/vars/prod.tfvars
+++ b/terraform/vars/prod.tfvars
@@ -0,0 +1 @@
+notification_channels = ["NNOynGwVz"]