diff --git a/docker/spiderfoot/Dockerfile b/docker/spiderfoot/Dockerfile
index 620f179c..51db10f7 100644
--- a/docker/spiderfoot/Dockerfile
+++ b/docker/spiderfoot/Dockerfile
@@ -1,33 +1,38 @@
 FROM alpine
 
 # Get and install dependencies & packages
-RUN apk -U upgrade && \
-    apk add bash \
+RUN apk -U --no-cache add \
             build-base \
             curl \
             git \
+            libxml2 \
             libxml2-dev \
+            libxslt \
             libxslt-dev \
+            openssl \
             openssl-dev \
-            procps \
+            python \
             python-dev \
             py-lxml \
             py-netaddr \
             py-mako \
+            py-markupsafe \
             py-pip \
             py-setuptools \
             py-requests \
             swig && \
-    pip install cherrypy \
+    pip install --no-cache-dir --upgrade pip && \ 
+    pip install --no-cache-dir \
+                cherrypy \
                 bs4 \
                 m2crypto && \
 
 # Setup user
     addgroup -g 2000 spiderfoot && \
-    adduser -S -s /bin/bash -u 2000 -D -g 2000 spiderfoot && \
+    adduser -S -s /bin/ash -u 2000 -D -g 2000 spiderfoot && \
 
 # Install spiderfoot 
-    git clone https://github.com/smicallef/spiderfoot -b v2.12.0-final /home/spiderfoot && \
+    git clone --depth=1 https://github.com/smicallef/spiderfoot -b v2.12.0-final /home/spiderfoot && \
     chown -R spiderfoot:spiderfoot /home/spiderfoot && \
     sed -i "s#'__docroot': ''#'__docroot': '\/spiderfoot'#" /home/spiderfoot/sf.py && \
     sed -i 's#raise cherrypy.HTTPRedirect("\/")#raise cherrypy.HTTPRedirect("\/spiderfoot")#' /home/spiderfoot/sfwebui.py && \
@@ -41,10 +46,6 @@ RUN apk -U upgrade && \
                     python-dev \
                     py-pip \
                     py-setuptools && \
-    apk add openssl \
-            libxml2 \
-            libxslt \
-            python && \
     rm -rf /var/cache/apk/*
 
 # Healthcheck
diff --git a/docker/spiderfoot/docker-compose.yml b/docker/spiderfoot/docker-compose.yml
index c9aa2428..070605ad 100644
--- a/docker/spiderfoot/docker-compose.yml
+++ b/docker/spiderfoot/docker-compose.yml
@@ -1,6 +1,4 @@
-# T-Pot (Standard)
-# For docker-compose ...
-version: '2.2'
+version: '2.3'
 
 networks:
   spiderfoot_local: