diff --git a/docker/elk/docker-compose.yml b/docker/elk/docker-compose.yml
index eace0337..69c3a54d 100644
--- a/docker/elk/docker-compose.yml
+++ b/docker/elk/docker-compose.yml
@@ -10,7 +10,8 @@ services:
     restart: always
     environment:
      - bootstrap.memory_lock=true
-     - "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
+     - ES_JAVA_OPTS=-Xms1024m -Xmx1024m
+     - ES_TMPDIR=/tmp
     cap_add:
      - IPC_LOCK
     ulimits:
diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile
index 2ef58d2b..1283ca8d 100644
--- a/docker/elk/elasticsearch/Dockerfile
+++ b/docker/elk/elasticsearch/Dockerfile
@@ -4,12 +4,11 @@ FROM alpine
 ADD dist/ /root/dist/
 
 # Setup env and apt
-RUN apk -U upgrade && \
-    apk add bash \
-            curl \
-            openjdk8-jre \
-            procps \
-            wget && \
+RUN apk -U --no-cache add \
+             bash \
+             curl \
+             openjdk8-jre \
+             wget && \
 
 # Get and install packages
     cd /root/dist/ && \
@@ -24,7 +23,7 @@ RUN apk -U upgrade && \
 
 # Setup user, groups and configs
     addgroup -g 2000 elasticsearch && \
-    adduser -S -H -s /bin/bash -u 2000 -D -g 2000 elasticsearch && \
+    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 elasticsearch && \
     chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/ && \
 
 # Clean up
@@ -36,4 +35,4 @@ HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9200/_cat/health'
 
 # Start ELK
 USER elasticsearch:elasticsearch
-CMD export ES_TMPDIR=/tmp && exec /usr/share/elasticsearch/bin/elasticsearch
+CMD ["/usr/share/elasticsearch/bin/elasticsearch"]
diff --git a/docker/elk/elasticsearch/docker-compose.yml b/docker/elk/elasticsearch/docker-compose.yml
index dd71c85b..d37e5c6d 100644
--- a/docker/elk/elasticsearch/docker-compose.yml
+++ b/docker/elk/elasticsearch/docker-compose.yml
@@ -1,6 +1,4 @@
-# T-Pot (Standard)
-# For docker-compose ...
-version: '2.2'
+version: '2.3'
 
 services:
 
@@ -12,7 +10,8 @@ services:
     restart: always
     environment:
      - bootstrap.memory_lock=true
-     - "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
+     - ES_JAVA_OPTS=-Xms1024m -Xmx1024m
+     - ES_TMPDIR=/tmp
     cap_add:
      - IPC_LOCK
     ulimits:
diff --git a/docker/elk/head/Dockerfile b/docker/elk/head/Dockerfile
index 630e341e..5a82fb15 100644
--- a/docker/elk/head/Dockerfile
+++ b/docker/elk/head/Dockerfile
@@ -1,24 +1,22 @@
 FROM alpine
 
 # Setup env and apt
-RUN apk -U upgrade && \
-    apk add bash \
-            curl \
-            git \
-            nodejs \
-            nodejs-npm \
-            procps && \
+RUN apk -U --no-cache add \
+              curl \
+              git \
+              nodejs \
+              nodejs-npm && \
 
 # Get and install packages
     mkdir -p /usr/src/app/ && \
     cd /usr/src/app/ && \
-    git clone https://github.com/mobz/elasticsearch-head . && \
+    git clone --depth=1 https://github.com/mobz/elasticsearch-head . && \
     npm install http-server && \
     sed -i 's/\"http\:\/\/localhost\:9200\"/\"https\:\/\/\<FQDN\>\:64297\/es\/\"/' /usr/src/app/_site/app.js && \
 
 # Setup user, groups and configs
     addgroup -g 2000 head && \
-    adduser -S -H -s /bin/bash -u 2000 -D -g 2000 head && \
+    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 head && \
     chown -R head:head /usr/src/app/ && \
 
 # Clean up
diff --git a/docker/elk/head/docker-compose.yml b/docker/elk/head/docker-compose.yml
index c8ba8a05..1da9454d 100644
--- a/docker/elk/head/docker-compose.yml
+++ b/docker/elk/head/docker-compose.yml
@@ -1,6 +1,4 @@
-# T-Pot (Standard)
-# For docker-compose ...
-version: '2.2'
+version: '2.3'
 
 services:
 
diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile
index 8ef71636..e3f7e55b 100644
--- a/docker/elk/kibana/Dockerfile
+++ b/docker/elk/kibana/Dockerfile
@@ -4,11 +4,9 @@ FROM alpine
 ADD dist/ /root/dist/
 
 # Setup env and apt
-RUN apk -U upgrade && \
-    apk add bash \
+RUN apk -U --no-cache add \
             curl \
             nodejs \
-            procps \
             wget && \
 
 # Get and install packages
@@ -56,7 +54,7 @@ RUN apk -U upgrade && \
     echo "@globalColorMagenta: #E20074;" >> /usr/share/kibana/src/ui/public/styles/variables/colors.less && \
     /usr/share/kibana/bin/kibana 2>&1 | grep -m 1 "Optimization of bundles" && \
     addgroup -g 2000 kibana && \
-    adduser -S -H -s /bin/bash -u 2000 -D -g 2000 kibana && \
+    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 kibana && \
     chown -R kibana:kibana /usr/share/kibana/ && \
 
 # Clean up
diff --git a/docker/elk/kibana/docker-compose.yml b/docker/elk/kibana/docker-compose.yml
index ca13a645..fbb053bd 100644
--- a/docker/elk/kibana/docker-compose.yml
+++ b/docker/elk/kibana/docker-compose.yml
@@ -1,6 +1,4 @@
-# T-Pot (Standard)
-# For docker-compose ...
-version: '2.2'
+version: '2.3'
 
 services:
 
diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile
index 588ad964..df4d0606 100644
--- a/docker/elk/logstash/Dockerfile
+++ b/docker/elk/logstash/Dockerfile
@@ -4,15 +4,14 @@ FROM alpine
 ADD dist/ /root/dist/
 
 # Setup env and apt
-RUN apk -U upgrade && \
-    apk --no-cache add \
-                    bash \
-                    curl \
-                    git \
-                    libc6-compat \
-                    libzmq \
-                    openjdk8-jre \
-                    wget && \
+RUN apk -U --no-cache add \
+               bash \
+               curl \
+               git \
+               libc6-compat \
+               libzmq \
+               openjdk8-jre \
+               wget && \
 
 # Get and install packages
     git clone --depth=1 https://github.com/dtag-dev-sec/listbot /etc/listbot && \