diff --git a/extensions/filebeat/config/filebeat.yml b/extensions/filebeat/config/filebeat.yml
index 1e9d0d9..119d5d5 100644
--- a/extensions/filebeat/config/filebeat.yml
+++ b/extensions/filebeat/config/filebeat.yml
@@ -19,6 +19,17 @@ filebeat.autodiscover:
         type: container
         paths:
           - /var/lib/docker/containers/${data.container.id}/*-json.log
+      templates:
+        - condition:
+            contains:
+              docker.container.image: elasticsearch
+          config:
+            - module: elasticsearch
+              server:
+                input:
+                  type: container
+                  paths:
+                    - /var/lib/docker/containers/${data.container.id}/*-json.log
 
 processors:
   - add_cloud_metadata: ~
diff --git a/setup/roles/filebeat_writer.json b/setup/roles/filebeat_writer.json
index 118614b..b24b873 100644
--- a/setup/roles/filebeat_writer.json
+++ b/setup/roles/filebeat_writer.json
@@ -2,6 +2,7 @@
   "cluster": [
     "manage_ilm",
     "manage_index_templates",
+    "manage_ingest_pipelines",
     "monitor",
     "read_pipeline"
   ],