diff --git a/src/commcare_cloud/manage_commcare_cloud/monitors/cert_expire.yml b/src/commcare_cloud/manage_commcare_cloud/monitors/cert_expire.yml
index 5315978ba4..f0ca53d0a4 100644
--- a/src/commcare_cloud/manage_commcare_cloud/monitors/cert_expire.yml
+++ b/src/commcare_cloud/manage_commcare_cloud/monitors/cert_expire.yml
@@ -17,6 +17,6 @@ options:
   silenced: {}
   thresholds: {critical: 5, ok: 1, warning: 1}
   timeout_h: 0
-query: '"http.ssl_cert".over("*").exclude("host:hqproxy0").by("host","instance","url").last(6).count_by_status()'
+query: '"http.ssl_cert".over("*").by("host","instance","url").last(6).count_by_status()'
 tags: [opsgenie]
 type: service check
diff --git a/src/commcare_cloud/manage_commcare_cloud/monitors/es_cluster_node_connection.yml b/src/commcare_cloud/manage_commcare_cloud/monitors/es_cluster_node_connection.yml
index 340fd7cf03..efdb80708c 100644
--- a/src/commcare_cloud/manage_commcare_cloud/monitors/es_cluster_node_connection.yml
+++ b/src/commcare_cloud/manage_commcare_cloud/monitors/es_cluster_node_connection.yml
@@ -4,9 +4,6 @@ message: |
   https://confluence.dimagi.com/display/commcarehq/Firefighting+HQ#FirefightingHQ-Elasticsearch
   See https://app.datadoghq.com/screen/127236/es-overview?tpl_var_cluster_name=*&tpl_var_scope={{ environment.name }}
   {{#is_alert}}
-  {{#is_match "environment" "production"}}
-  For details check [hqes0](http://hqes0.internal-va.commcarehq.org:9200/_cluster/health?pretty=true), [hqes1](http://hqes1.internal-va.commcarehq.org:9200/_cluster/health?pretty=true) or [hqes3](http://hqes3.internal-va.commcarehq.org:9200/_cluster/health?pretty=true)
-  {{/is_match}}
   {{/is_alert}}
   {{#is_recovery}}ES cluster status back to GREEN.{{/is_recovery}}
   << notification_block >>
diff --git a/src/commcare_cloud/manage_commcare_cloud/monitors/site_down.yml b/src/commcare_cloud/manage_commcare_cloud/monitors/site_down.yml
index ccea2ea217..8ee5b76fc8 100644
--- a/src/commcare_cloud/manage_commcare_cloud/monitors/site_down.yml
+++ b/src/commcare_cloud/manage_commcare_cloud/monitors/site_down.yml
@@ -17,7 +17,6 @@ options:
   notify_no_data: true
   renotify_interval: 10
   silenced:
-    host:hqproxy0: null
     host:proxy0.india.commcarehq.org: null
     host:proxy1.internal-icds.commcarehq.org: null
     instance:icds_heartbeat: null