diff --git a/extensions/curator/Dockerfile b/extensions/curator/Dockerfile
index 84ff5ad..6cb8cdc 100644
--- a/extensions/curator/Dockerfile
+++ b/extensions/curator/Dockerfile
@@ -1,17 +1,9 @@
-FROM bitnami/elasticsearch-curator:5.8.1
+FROM untergeek/curator:8.0.2
 
 USER root
 
-RUN install_packages cron && \
-    echo \
-        '* * * * *' \
-        root \
-        LC_ALL=C.UTF-8 LANG=C.UTF-8 \
-        /opt/bitnami/python/bin/curator \
-        --config=/usr/share/curator/config/curator.yml \
-        /usr/share/curator/config/delete_log_files_curator.yml \
-        '>/proc/1/fd/1' '2>/proc/1/fd/2' \
-        >>/etc/crontab
+RUN >>/var/spool/cron/crontabs/nobody \
+    echo '* * * * * /curator/curator /.curator/delete_log_files_curator.yml'
 
-ENTRYPOINT ["cron"]
-CMD ["-f", "-L8"]
+ENTRYPOINT ["crond"]
+CMD ["-f", "-d8"]
diff --git a/extensions/curator/config/curator.yml b/extensions/curator/config/curator.yml
index f4cf8de..6777edc 100644
--- a/extensions/curator/config/curator.yml
+++ b/extensions/curator/config/curator.yml
@@ -1,11 +1,12 @@
 # Curator configuration
 # https://www.elastic.co/guide/en/elasticsearch/client/curator/current/configfile.html
 
-client:
-  hosts:
-    - elasticsearch
-  port: 9200
-  http_auth: 'elastic:changeme'
+elasticsearch:
+  client:
+    hosts: [ http://elasticsearch:9200 ]
+  other_settings:
+    username: elastic
+    password: ${ELASTIC_PASSWORD}
 
 logging:
   loglevel: INFO
diff --git a/extensions/curator/curator-compose.yml b/extensions/curator/curator-compose.yml
index 488cd80..1a4bb17 100644
--- a/extensions/curator/curator-compose.yml
+++ b/extensions/curator/curator-compose.yml
@@ -6,8 +6,10 @@ services:
       context: extensions/curator/
     init: true
     volumes:
-      - ./extensions/curator/config/curator.yml:/usr/share/curator/config/curator.yml:ro,Z
-      - ./extensions/curator/config/delete_log_files_curator.yml:/usr/share/curator/config/delete_log_files_curator.yml:ro,Z
+      - ./extensions/curator/config/curator.yml:/.curator/curator.yml:ro,Z
+      - ./extensions/curator/config/delete_log_files_curator.yml:/.curator/delete_log_files_curator.yml:ro,Z
+    environment:
+      ELASTIC_PASSWORD: ${ELASTIC_PASSWORD:-}
     networks:
       - elk
     depends_on: