diff --git a/plugin/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json b/plugin/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json
index 128de820f6f..73a595509b4 100644
--- a/plugin/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json
+++ b/plugin/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json
@@ -43,7 +43,7 @@
                       "filter": [
                         {
                           "term": {
-                            "cluster_uuid": "{{ctx.metadata.cluster_uuid}}"
+                            "cluster_uuid": "{{ctx.metadata.xpack.cluster_uuid}}"
                           }
                         },
                         {
diff --git a/plugin/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json b/plugin/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json
index 364b776f382..fd3d6cc0741 100644
--- a/plugin/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json
+++ b/plugin/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json
@@ -36,7 +36,7 @@
                       "filter": [
                         {
                           "term": {
-                            "_id": "{{ctx.metadata.cluster_uuid}}"
+                            "_id": "{{ctx.metadata.xpack.cluster_uuid}}"
                           }
                         },
                         {
diff --git a/plugin/src/main/resources/monitoring/watches/kibana_version_mismatch.json b/plugin/src/main/resources/monitoring/watches/kibana_version_mismatch.json
index 89a06496465..b208963c138 100644
--- a/plugin/src/main/resources/monitoring/watches/kibana_version_mismatch.json
+++ b/plugin/src/main/resources/monitoring/watches/kibana_version_mismatch.json
@@ -33,7 +33,7 @@
                       "filter": [
                         {
                           "term": {
-                            "cluster_uuid": "{{ctx.metadata.cluster_uuid}}"
+                            "cluster_uuid": "{{ctx.metadata.xpack.cluster_uuid}}"
                           }
                         },
                         {
diff --git a/plugin/src/main/resources/monitoring/watches/logstash_version_mismatch.json b/plugin/src/main/resources/monitoring/watches/logstash_version_mismatch.json
index 4f2d3562a32..fd5e9d23c26 100644
--- a/plugin/src/main/resources/monitoring/watches/logstash_version_mismatch.json
+++ b/plugin/src/main/resources/monitoring/watches/logstash_version_mismatch.json
@@ -33,7 +33,7 @@
                       "filter": [
                         {
                           "term": {
-                            "cluster_uuid": "{{ctx.metadata.cluster_uuid}}"
+                            "cluster_uuid": "{{ctx.metadata.xpack.cluster_uuid}}"
                           }
                         },
                         {