diff --git a/devops/jobs/CheckASGLifeCycleHooks.groovy b/devops/jobs/CheckASGLifeCycleHooks.groovy
index 4aa001fb2..4e7549a45 100644
--- a/devops/jobs/CheckASGLifeCycleHooks.groovy
+++ b/devops/jobs/CheckASGLifeCycleHooks.groovy
@@ -113,7 +113,7 @@ class CheckASGLifeCycleHooks {
                                         "metric": "${datadog_heartbeat_name}",
                                         "points": [['\$(date +%s)', 1]],
                                         "type": "gauge",
-                                        "tags": ["env:${deployment}", "app:check-asg-lifecycle-hooks"]
+                                        "tags": ["env:${deployment}"]
                                     }]
                                 }
                                 """
diff --git a/devops/jobs/CheckTableSize.groovy b/devops/jobs/CheckTableSize.groovy
index 654313831..595ec3703 100644
--- a/devops/jobs/CheckTableSize.groovy
+++ b/devops/jobs/CheckTableSize.groovy
@@ -25,6 +25,7 @@ class CheckTableSize {
                             def variable = "${deployment}-table-size-monitoring"
                             string("ROLE_ARN", variable)
                             string("GENIE_KEY", "opsgenie_heartbeat_key")
+                            string("DD_KEY", "datadog_heartbeat_key")
                         }
                     }
 
diff --git a/devops/jobs/Janitor.groovy b/devops/jobs/Janitor.groovy
index d74675332..65a66817b 100644
--- a/devops/jobs/Janitor.groovy
+++ b/devops/jobs/Janitor.groovy
@@ -103,6 +103,7 @@ class Janitor {
                     env('AWS_CLEANER', configuration.get('aws_cleaner'))
                     env('DENY_LIST', configuration.get('deny_list'))
                     env('NOOP', extraVars.get('NOOP', false))
+                    env('DEPLOYMENT', deployment)
                 }
 
 
diff --git a/devops/jobs/ProspectusJanitor.groovy b/devops/jobs/ProspectusJanitor.groovy
index fbca7a5e2..435eca579 100644
--- a/devops/jobs/ProspectusJanitor.groovy
+++ b/devops/jobs/ProspectusJanitor.groovy
@@ -41,6 +41,7 @@ class ProspectusJanitor {
                     credentialsBinding {
                         string('ROLE_ARN', "tools-jenkins-janitor-${deployment}-role-arn")
                         string("GENIE_KEY", "opsgenie_heartbeat_key")
+                        string("DD_KEY", "datadog_heartbeat_key")
                     }
                 }
 
@@ -100,6 +101,7 @@ class ProspectusJanitor {
                     env('AWS_REGION', configuration.get('aws_region', 'us-east-1'))
                     env('AWS_CLEANER', configuration.get('aws_cleaner'))
                     env('NOOP', extraVars.get('NOOP', false))
+                    env('DEPLOYMENT', deployment)
                 }
 
 
diff --git a/devops/resources/janitor.sh b/devops/resources/janitor.sh
index afbb80fc7..609cd7dd7 100644
--- a/devops/resources/janitor.sh
+++ b/devops/resources/janitor.sh
@@ -50,6 +50,6 @@ curl -X POST "https://api.datadoghq.com/api/v1/series?api_key=${DD_KEY}" \
           "metric": '${JOB_NAME##*/}".heartbeat"',
           "points": [['"$(date +%s)"', 1]],
           "type": "gauge",
-          "tags": ["env:edge", "app:minos"]
+          "tags": ["env:'${DEPLOYMENT}'"]
       }]
   }'
diff --git a/devops/resources/table-size-monitoring.sh b/devops/resources/table-size-monitoring.sh
index 24f306966..2596508e7 100644
--- a/devops/resources/table-size-monitoring.sh
+++ b/devops/resources/table-size-monitoring.sh
@@ -32,3 +32,13 @@ fi
 python check_table_size.py  --threshold ${THRESHOLD} ${RDSTHRESHOLD} ${RDSIGNORE}
 
 curl -X GET 'https://api.opsgenie.com/v2/heartbeats/table-size-monitoring-'${DEPLOYMENT}'/ping' -H 'Authorization: GenieKey '${GENIE_KEY}
+curl -X POST "https://api.datadoghq.com/api/v1/series?api_key=${DD_KEY}" \
+-H "Content-Type: application/json" \
+-d '{
+      "series" : [{
+          "metric": "table-size-monitoring-"'${DEPLOYMENT}".heartbeat"',
+          "points": [['"$(date +%s)"', 1]],
+          "type": "gauge",
+          "tags": ["env:'${DEPLOYMENT}'"]
+      }]
+  }'