diff --git a/charts/base-cluster/templates/monitoring/deadMansSwitch/cronjob.yaml b/charts/base-cluster/templates/monitoring/deadMansSwitch/cronjob.yaml
index cc66cac84a..ca973d8c27 100644
--- a/charts/base-cluster/templates/monitoring/deadMansSwitch/cronjob.yaml
+++ b/charts/base-cluster/templates/monitoring/deadMansSwitch/cronjob.yaml
@@ -56,7 +56,7 @@ spec:
                 - '5'
                 - --max-time
                 - '30'
-                - {{ printf "https://hc-ping.com/$(PING_KEY)/k8s-cluster-%s-%s-scheduling" (.Values.global.baseDomain | replace "." "-") .Values.global.clusterName }}
+                - {{ printf "https://hc-ping.com/$(PING_KEY)/%s-scheduling" (include "base-cluster.deadMansSwitch.checkName" .) }}
               resources:
                 requests:
                   cpu: 100m
diff --git a/charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml b/charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml
index 9011228aa9..982e767a64 100644
--- a/charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml
+++ b/charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml
@@ -50,16 +50,14 @@ spec:
                 local checkName="$1"
                 local existingChecks
                 local existingCheckUUID
-                existingCheckUUID="$(curl --silent --fail --retry 5 --max-time 30 --header "X-Api-Key: $apiKey" "https://healthchecks.io/api/v3/checks/?slug=$checkName" | sed -r 's#^.*ping_url":\s*"[^"]+/([^"]+)".*$#\1#')"
+                existingCheckUUID="$(curl --silent --fail --retry 5 --max-time 30 --header "X-Api-Key: $API_KEY" "https://healthchecks.io/api/v3/checks/?slug=$checkName" | sed -r 's#^.*ping_url":\s*"[^"]+/([^"]+)".*$#\1#')"
 
                 if curl --silent --show-error --fail --retry 5 --max-time 30 --header "X-Api-Key: $API_KEY" "https://healthchecks.io/api/v3/checks/$existingCheckUUID" > /dev/null; then
                   curl --silent --show-error --fail --retry 5 --max-time 30 --header "X-Api-Key: $API_KEY" "https://healthchecks.io/api/v3/checks/$existingCheckUUID" --request DELETE
                 fi
               }
 
-              checkName={{- printf "k8s-cluster-%s-%s" (.Values.global.baseDomain | replace "." "-") .Values.global.clusterName | quote }}
-              {{- if .Values.monitoring.prometheus.enabled }}
+              checkName={{- include "base-cluster.deadMansSwitch.checkName" . | quote }}
               deleteCheck "$checkName-monitoring"
-              {{- end }}
               deleteCheck "$checkName-scheduling"
 {{- end }}
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
index 03a5f34a08..4627857a82 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
@@ -43,7 +43,7 @@ config:
     {{- $receivers = set $receivers "healthchecks.io" (dict
           "webhook_configs" (list
             (dict
-              "url" (printf "https://hc-ping.com/%s/%s" .Values.monitoring.deadMansSwitch.pingKey (include "base-cluster.deadMansSwitch.checkName" .))
+              "url" (printf "https://hc-ping.com/%s/%s-monitoring" .Values.monitoring.deadMansSwitch.pingKey (include "base-cluster.deadMansSwitch.checkName" .))
               "send_resolved" false
             )
           )