diff --git a/elk_metrics_6x/roles/elastic_beat_setup/defaults/main.yml b/elk_metrics_6x/roles/elastic_beat_setup/defaults/main.yml
index da5eccb3..998b689f 100644
--- a/elk_metrics_6x/roles/elastic_beat_setup/defaults/main.yml
+++ b/elk_metrics_6x/roles/elastic_beat_setup/defaults/main.yml
@@ -17,7 +17,6 @@
 elastic_setup_flags:
   - "--template"
   - "--pipelines"
-  - "--machine-learning"
   # - "--dashboards"
 
 # Setup options are cast as a string with, one option per line.
diff --git a/elk_metrics_6x/roles/elasticsearch/defaults/main.yml b/elk_metrics_6x/roles/elasticsearch/defaults/main.yml
index 97fccbe3..d65bc778 100644
--- a/elk_metrics_6x/roles/elasticsearch/defaults/main.yml
+++ b/elk_metrics_6x/roles/elasticsearch/defaults/main.yml
@@ -26,8 +26,6 @@ elastic_memory_lock: true
 # playbooks are executed, which ensures the plugins are always upgraded.
 elastic_plugins:
   - ingest-attachment
-  - ingest-geoip
-  - ingest-user-agent
 
 # Set the logstash search heap size. If this option is undefined the value will
 # be derived automatically using 1/4 of the available RAM for logstash and 1/2