diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 9ec0f81b0..a3db170cd 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -5,7 +5,7 @@ steps:
     env:
       PYTHON_VERSION: "{{ matrix.python }}"
       TEST_SUITE: "platinum"
-      STACK_VERSION: "8.16.0-SNAPSHOT"
+      STACK_VERSION: "8.18.0-SNAPSHOT"
       PYTHON_CONNECTION_CLASS: "{{ matrix.connection }}"
       NOX_SESSION: "{{ matrix.nox_session }}"
     matrix:
diff --git a/test_elasticsearch/utils.py b/test_elasticsearch/utils.py
index 4a26aa4c0..8a13ff62f 100644
--- a/test_elasticsearch/utils.py
+++ b/test_elasticsearch/utils.py
@@ -425,6 +425,9 @@ def is_xpack_template(name):
         return True
 
     return name in {
+        "agentless",
+        "agentless@mappings",
+        "agentless@settings",
         "apm-10d@lifecycle",
         "apm-180d@lifecycle",
         "apm-390d@lifecycle",