diff --git a/elasticsearch-api/api-spec-testing/wipe_cluster.rb b/elasticsearch-api/api-spec-testing/wipe_cluster.rb
index 50daf5851..1da765be1 100644
--- a/elasticsearch-api/api-spec-testing/wipe_cluster.rb
+++ b/elasticsearch-api/api-spec-testing/wipe_cluster.rb
@@ -23,14 +23,41 @@ module Elasticsearch
   module RestAPIYAMLTests
     module WipeCluster
       PRESERVE_ILM_POLICY_IDS = [
-        'ilm-history-ilm-policy', 'slm-history-ilm-policy', 'watch-history-ilm-policy',
-        'watch-history-ilm-policy-16', 'ml-size-based-ilm-policy', 'logs', 'metrics', 'profiling',
-        'synthetics', '7-days-default', '30-days-default', '90-days-default', '180-days-default',
-        '365-days-default', '.fleet-files-ilm-policy', '.fleet-file-data-ilm-policy',
-        '.fleet-actions-results-ilm-policy', '.fleet-file-fromhost-data-ilm-policy',
-        '.fleet-file-fromhost-meta-ilm-policy', '.fleet-file-tohost-data-ilm-policy',
-        '.fleet-file-tohost-meta-ilm-policy', '.deprecation-indexing-ilm-policy',
-        '.monitoring-8-ilm-policy', 'behavioral_analytics-events-default_policy',
+        'ilm-history-ilm-policy',
+        'slm-history-ilm-policy',
+        'watch-history-ilm-policy',
+        'watch-history-ilm-policy-16',
+        'ml-size-based-ilm-policy',
+        'logs',
+        'logs@lifecycle',
+        'metrics',
+        'metrics@lifecycle',
+        'profiling-60-days',
+        'profiling-60-days@lifecycle',
+        'synthetics',
+        'agentless',
+        'synthetics@lifecycle',
+        'traces@lifecycle',
+        '7-days-default',
+        '7-days@lifecycle',
+        '30-days-default',
+        '30-days@lifecycle',
+        '90-days-default',
+        '90-days@lifecycle',
+        '180-days-default',
+        '180-days@lifecycle',
+        '365-days-default',
+        '365-days@lifecycle',
+        '.fleet-files-ilm-policy',
+        '.fleet-file-data-ilm-policy',
+        '.fleet-actions-results-ilm-policy',
+        '.fleet-file-fromhost-data-ilm-policy',
+        '.fleet-file-fromhost-meta-ilm-policy',
+        '.fleet-file-tohost-data-ilm-policy',
+        '.fleet-file-tohost-meta-ilm-policy',
+        '.deprecation-indexing-ilm-policy',
+        '.monitoring-8-ilm-policy',
+        'behavioral_analytics-events-default_policy',
         'logs-apm.app_logs-default_policy',
         'logs-apm.error_logs-default_policy',
         'metrics-apm.app_metrics-default_policy',
@@ -421,11 +448,11 @@ def clear_ml_jobs(client)
         def clear_datafeeds(client)
           client.ml.stop_datafeed(datafeed_id: '_all', force: true)
           client.ml.get_datafeeds['datafeeds'].each do |d|
-            client.ml.stop_datafeed(datafeed_id: d['datafeed_id'], force: true)
-            begin
+            Thread.new do
+              client.ml.stop_datafeed(datafeed_id: d['datafeed_id'], force: true)
               client.ml.delete_datafeed(datafeed_id: d['datafeed_id'], force: true)
-            rescue StandardError => e
-              logger.info(e)
+            rescue StandardError
+              logger.info('Exception deleting datafeed')
             end
           end
         end
@@ -485,7 +512,7 @@ def delete_trained_models(client)
           return unless models['trained_model_configs']
 
           models['trained_model_configs'].each do |model|
-            client.ml.delete_trained_model(model_id: model['model_id'], force: true, ignore: 400, timeout: '120s')
+            client.ml.delete_trained_model(model_id: model['model_id'], force: true, ignore: 400)
           end
         end
       end