diff --git a/devops/jobs/CreateSandboxCI.groovy b/devops/jobs/CreateSandboxCI.groovy
index 85cb3e64d..c63177ca6 100644
--- a/devops/jobs/CreateSandboxCI.groovy
+++ b/devops/jobs/CreateSandboxCI.groovy
@@ -131,8 +131,7 @@ class CreateSandboxCI {
                               "series": [{
                                   "metric": "${metricName}",
                                   "points": [['\$(date +%s)', 1]],
-                                  "type": "gauge",
-                                  "tags": ["env:${deployment}", "app:check-asg-lifecycle-hooks"]
+                                  "type": "gauge"
                               }]
                           }
                           """
diff --git a/devops/jobs/SandboxTermination.groovy b/devops/jobs/SandboxTermination.groovy
index 7470ac39d..c8a641528 100644
--- a/devops/jobs/SandboxTermination.groovy
+++ b/devops/jobs/SandboxTermination.groovy
@@ -103,15 +103,14 @@ class SandboxTermination{
                 if (opsgenie_heartbeat_name) {
                     shell('curl -X GET "https://api.opsgenie.com/v2/heartbeats/'+opsgenie_heartbeat_name+'/ping" -H "Authorization: GenieKey ${GENIE_KEY}"')
                 }
-                String datadog_heartbeat_name = configuration.get('DATADOG_HEARTBEAT_NAME', '')
+                String datadog_heartbeat_name = extraVars.get('DATADOG_HEARTBEAT_NAME', '')
                 if (datadog_heartbeat_name) {
                     String DD_JSON = """
                         {
                             "series": [{
                                 "metric": "${datadog_heartbeat_name}",
                                 "points": [['\$(date +%s)', 1]],
-                                "type": "gauge",
-                                "tags": ["env:${deployment}", "app:check-asg-lifecycle-hooks"]
+                                "type": "gauge"
                             }]
                         }
                         """