diff --git a/docker/elk/docker-compose.yml b/docker/elk/docker-compose.yml
index 10fd8b67..896b2cd5 100644
--- a/docker/elk/docker-compose.yml
+++ b/docker/elk/docker-compose.yml
@@ -54,7 +54,7 @@ services:
     image: "dtagdevsec/logstash:2006"
     volumes:
      - /data:/data
-     - /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf
+#     - /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf
 
 ## Elasticsearch-head service
   head:
diff --git a/docker/elk/elasticsearch/Dockerfile.new b/docker/elk/elasticsearch/Dockerfile.new
deleted file mode 100644
index 45108a4d..00000000
--- a/docker/elk/elasticsearch/Dockerfile.new
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM alpine
-#
-# VARS
-ENV ES_VER=7.5.2 \
-    JAVA_HOME=/usr/lib/jvm/java-11-openjdk
-# Include dist
-ADD dist/ /root/dist/
-#
-# Setup env and apt
-RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
-    apk -U --no-cache add \
-             aria2 \
-             bash \
-             curl \
-             nss \
-             openjdk11-jre && \
-#
-# Get and install packages
-    cd /root/dist/ && \
-    mkdir -p /usr/share/elasticsearch/ && \
-    aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VER-linux-x86_64.tar.gz && \
-    tar xvfz elasticsearch-$ES_VER-linux-x86_64.tar.gz --strip-components=1 -C /usr/share/elasticsearch/ && \
-#
-# Add and move files
-    cd /root/dist/ && \
-    mkdir -p /usr/share/elasticsearch/config && \
-    cp elasticsearch.yml /usr/share/elasticsearch/config/ && \
-#
-# Setup user, groups and configs
-    addgroup -g 2000 elasticsearch && \
-    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 elasticsearch && \
-    chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/ && \
-    rm -rf /usr/share/elasticsearch/modules/x-pack-ml && \
-#
-# Clean up
-    apk del --purge aria2 && \
-    rm -rf /root/* && \
-    rm -rf /tmp/* && \
-    rm -rf /var/cache/apk/*
-#
-# Healthcheck
-HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9200/_cat/health'
-#
-# Start ELK
-USER elasticsearch:elasticsearch
-CMD ["/usr/share/elasticsearch/bin/elasticsearch"]
diff --git a/docker/elk/elasticsearch/Dockerfile.old b/docker/elk/elasticsearch/Dockerfile.old
deleted file mode 100644
index f1eb0183..00000000
--- a/docker/elk/elasticsearch/Dockerfile.old
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM alpine
-#
-# Include dist
-ADD dist/ /root/dist/
-#
-# Setup env and apt
-RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
-    apk -U --no-cache add \
-             aria2 \
-             bash \
-             curl \
-             nss \
-             openjdk8-jre && \
-#
-# Get and install packages
-    cd /root/dist/ && \
-    mkdir -p /usr/share/elasticsearch/ && \
-    aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.6.tar.gz && \
-    tar xvfz elasticsearch-6.8.6.tar.gz --strip-components=1 -C /usr/share/elasticsearch/ && \
-#
-# Add and move files
-    cd /root/dist/ && \
-    mkdir -p /usr/share/elasticsearch/config && \
-    cp elasticsearch.yml /usr/share/elasticsearch/config/ && \
-#
-# Setup user, groups and configs
-    addgroup -g 2000 elasticsearch && \
-    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 elasticsearch && \
-    chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/ && \
-    rm -rf /usr/share/elasticsearch/modules/x-pack-ml && \
-#
-# Clean up
-    apk del --purge aria2 && \
-    rm -rf /root/* && \
-    rm -rf /tmp/* && \
-    rm -rf /var/cache/apk/*
-#
-# Healthcheck
-HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9200/_cat/health'
-#
-# Start ELK
-USER elasticsearch:elasticsearch
-ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
-CMD ["/usr/share/elasticsearch/bin/elasticsearch"]
diff --git a/docker/elk/kibana/Dockerfile.old b/docker/elk/kibana/Dockerfile.old
deleted file mode 100644
index 5088f540..00000000
--- a/docker/elk/kibana/Dockerfile.old
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM node:10.15.2-alpine
-#
-# Include dist
-ADD dist/ /root/dist/
-#
-# Setup env and apt
-RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
-    apk -U --no-cache add \
-            aria2 \
-            curl && \
-#
-# Get and install packages
-    cd /root/dist/ && \
-    mkdir -p /usr/share/kibana/ && \
-    aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/kibana/kibana-6.8.6-linux-x86_64.tar.gz && \
-    tar xvfz kibana-6.8.6-linux-x86_64.tar.gz --strip-components=1 -C /usr/share/kibana/ && \
-#
-# Kibana's bundled node does not work in alpine
-    rm /usr/share/kibana/node/bin/node && \
-    ln -s /usr/bin/node /usr/share/kibana/node/bin/node && \
-#
-# Add and move files
-    cd /root/dist/ && \
-    cp kibana.svg /usr/share/kibana/src/ui/public/images/kibana.svg && \
-    cp kibana.svg /usr/share/kibana/src/ui/public/icons/kibana.svg && \
-    cp elk.ico /usr/share/kibana/src/ui/public/assets/favicons/favicon.ico && \
-    cp elk.ico /usr/share/kibana/src/ui/public/assets/favicons/favicon-16x16.png && \
-    cp elk.ico /usr/share/kibana/src/ui/public/assets/favicons/favicon-32x32.png && \
-#
-# Setup user, groups and configs
-    sed -i 's/#server.basePath: ""/server.basePath: "\/kibana"/' /usr/share/kibana/config/kibana.yml && \
-    sed -i 's/#kibana.defaultAppId: "home"/kibana.defaultAppId: "dashboards"/' /usr/share/kibana/config/kibana.yml && \
-    sed -i 's/#server.host: "localhost"/server.host: "0.0.0.0"/' /usr/share/kibana/config/kibana.yml && \
-    sed -i 's/#elasticsearch.hosts: \["http:\/\/localhost:9200"\]/elasticsearch.hosts: \["http:\/\/elasticsearch:9200"\]/' /usr/share/kibana/config/kibana.yml && \
-    sed -i 's/#server.rewriteBasePath: false/server.rewriteBasePath: false/' /usr/share/kibana/config/kibana.yml && \
-    sed -i "s/#005571/#e20074/g" /usr/share/kibana/built_assets/css/plugins/kibana/index.css && \
-    sed -i "s/#007ba4/#9e0051/g" /usr/share/kibana/built_assets/css/plugins/kibana/index.css && \
-    sed -i "s/#00465d/#4f0028/g" /usr/share/kibana/built_assets/css/plugins/kibana/index.css && \
-    echo "xpack.infra.enabled: false" >> /usr/share/kibana/config/kibana.yml && \ 
-    echo "xpack.logstash.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.canvas.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.spaces.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.apm.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.uptime.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    rm -rf /usr/share/kibana/optimize/bundles/* && \
-    /usr/share/kibana/bin/kibana --optimize && \
-    addgroup -g 2000 kibana && \
-    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 kibana && \
-    chown -R kibana:kibana /usr/share/kibana/ && \
-#
-# Clean up
-    apk del --purge aria2 && \
-    rm -rf /root/* && \
-    rm -rf /tmp/* && \
-    rm -rf /var/cache/apk/*
-#
-# Healthcheck
-HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:5601'
-#
-# Start kibana
-STOPSIGNAL SIGKILL
-USER kibana:kibana
-CMD ["/usr/share/kibana/bin/kibana"]
diff --git a/docker/elk/logstash/Dockerfile.old b/docker/elk/logstash/Dockerfile.old
deleted file mode 100644
index 9d39fedf..00000000
--- a/docker/elk/logstash/Dockerfile.old
+++ /dev/null
@@ -1,56 +0,0 @@
-FROM alpine
-#
-# Include dist
-ADD dist/ /root/dist/
-#
-# Setup env and apt
-RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
-    apk -U --no-cache add \
-             aria2 \
-             bash \
-             bzip2 \
-	     curl \
-             libc6-compat \
-             libzmq \
-             nss \
-             openjdk8-jre && \
-#
-# Get and install packages
-    mkdir -p /etc/listbot && \
-    cd /etc/listbot && \
-    aria2c -s16 -x 16 https://raw.githubusercontent.com/dtag-dev-sec/listbot/master/cve.yaml.bz2 && \
-    aria2c -s16 -x 16 https://raw.githubusercontent.com/dtag-dev-sec/listbot/master/iprep.yaml.bz2 && \
-    bunzip2 *.bz2 && \
-    cd /root/dist/ && \
-    mkdir -p /usr/share/logstash/ && \
-    aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/logstash/logstash-6.8.6.tar.gz && \
-    tar xvfz logstash-6.8.6.tar.gz --strip-components=1 -C /usr/share/logstash/ && \
-    /usr/share/logstash/bin/logstash-plugin install logstash-filter-translate && \
-    /usr/share/logstash/bin/logstash-plugin install logstash-output-syslog && \
-#
-# Add and move files
-    cd /root/dist/ && \
-    cp update.sh /usr/bin/ && \
-    chmod u+x /usr/bin/update.sh && \
-    mkdir -p /etc/logstash/conf.d && \
-    cp logstash.conf /etc/logstash/conf.d/ && \
-    cp elasticsearch-template-es6x.json /usr/share/logstash/vendor/bundle/jruby/2.5.0/gems/logstash-output-elasticsearch-9.4.0-java/lib/logstash/outputs/elasticsearch/ && \
-#
-# Setup user, groups and configs
-    addgroup -g 2000 logstash && \
-    adduser -S -H -s /bin/bash -u 2000 -D -g 2000 logstash && \
-    chown -R logstash:logstash /usr/share/logstash && \
-    chown -R logstash:logstash /etc/listbot && \
-    chmod 755 /usr/bin/update.sh && \
-#
-# Clean up
-    rm -rf /root/* && \
-    rm -rf /tmp/* && \
-    rm -rf /var/cache/apk/*
-#
-# Healthcheck
-HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9600'
-#
-# Start logstash
-#USER logstash:logstash
-CMD update.sh && exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf --config.reload.automatic --java-execution