diff --git a/ckan-datapusher.sh b/ckan-datapusher.sh
index 45c9931..b74dcd8 100755
--- a/ckan-datapusher.sh
+++ b/ckan-datapusher.sh
@@ -2,6 +2,9 @@
 
 SOURCE_DIR=$(realpath $(dirname "${0}"))/ckan-datapusher
 
+# Check prerequisites
+docker image ls | grep -q python2 || $(realpath $(dirname "${0}"))/python2.sh
+
 # Build Docker container
 docker build -t ckan-datapusher ${SOURCE_DIR}
 cp ${SOURCE_DIR}/etc/init.d/ckan-datapusher /etc/init.d/ckan-datapusher
diff --git a/ckan-datapusher/Dockerfile b/ckan-datapusher/Dockerfile
index 8fa2a45..a5ffd20 100644
--- a/ckan-datapusher/Dockerfile
+++ b/ckan-datapusher/Dockerfile
@@ -1,14 +1,6 @@
-FROM alpine:3.7
+FROM python2
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
-RUN \
- # Install Python2 runtime
- apk --no-cache add python2
-
-RUN \
- # Install runtime XML dependencies
- apk --no-cache add libxml2 libxslt
-
 RUN \
  # Install runtime dependencies
  apk --no-cache add libffi libressl uwsgi-python
diff --git a/ckan.sh b/ckan.sh
index 2ed65ca..1504b2e 100755
--- a/ckan.sh
+++ b/ckan.sh
@@ -6,6 +6,7 @@ SOURCE_DIR=$(realpath $(dirname "${0}"))/ckan
 docker image ls | grep -q ckan-datapusher || $(realpath $(dirname "${0}"))/ckan-datapusher.sh
 docker image ls | grep -q postfix || $(realpath $(dirname "${0}"))/postfix.sh
 docker image ls | grep -q postgres || $(realpath $(dirname "${0}"))/postgres.sh
+docker image ls | grep -q python2 || $(realpath $(dirname "${0}"))/python2.sh
 docker image ls | grep -q redis || $(realpath $(dirname "${0}"))/redis.sh
 docker image ls | grep -q solr || $(realpath $(dirname "${0}"))/solr.sh
 service postgres start
diff --git a/ckan/Dockerfile b/ckan/Dockerfile
index 5c953ec..1621d6f 100644
--- a/ckan/Dockerfile
+++ b/ckan/Dockerfile
@@ -1,19 +1,11 @@
-FROM alpine:3.7
+FROM python2
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
-RUN \
- # Install Python2 runtime
- apk --no-cache add python2
-
-RUN \
- # Install runtime XML dependencies
- apk --no-cache add libxml2 libxslt
-
 RUN \
  # Add edge/testing repository
  echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
  # Install runtime dependencies
- && apk --no-cache add geos@edge libjpeg-turbo libmagic libpq mailcap py2-pip s6 zlib
+ && apk --no-cache add geos@edge libjpeg-turbo libmagic libpq mailcap py2-pip zlib
 
 RUN \
  # Install build dependencies
diff --git a/cts.sh b/cts.sh
index 6e0fc67..c9af209 100755
--- a/cts.sh
+++ b/cts.sh
@@ -4,6 +4,7 @@ SOURCE_DIR=$(realpath $(dirname "${0}"))/cts
 
 # Check prerequisites
 docker image ls | grep -q postgres || $(realpath $(dirname "${0}"))/postgres.sh
+docker image ls | grep -q python2 || $(realpath $(dirname "${0}"))/python2.sh
 service postgres start
 
 # Build Docker container
diff --git a/cts/Dockerfile b/cts/Dockerfile
index 6cd350f..c42dd8e 100644
--- a/cts/Dockerfile
+++ b/cts/Dockerfile
@@ -1,15 +1,11 @@
-FROM alpine:3.7
+FROM python2
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
-RUN \
- # Install Python2 runtime
- apk --no-cache add python2
-
 RUN \
  # Add edge/testing repository
  echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
  # Install runtime dependencies
- && apk --no-cache add geos@edge libpq nginx s6 zlib
+ && apk --no-cache add geos@edge libpq nginx zlib
 
 RUN \
  # Install build dependencies
diff --git a/frontlinesms/Dockerfile b/frontlinesms/Dockerfile
index 7fed98c..686f769 100644
--- a/frontlinesms/Dockerfile
+++ b/frontlinesms/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Disassembler <disassembler@dasm.cz>
 
 RUN \
  # Install runtime dependencies
- apk --no-cache add openjdk8-jre s6 ttf-dejavu xf86-video-dummy xorg-server \
+ apk --no-cache add openjdk8-jre ttf-dejavu xf86-video-dummy xorg-server \
  # Create OS user
  && addgroup -S -g 8018 sms \
  && adduser -S -u 8018 -h /srv/frontlinesms -s /bin/sh -g sms -G sms sms \
diff --git a/gnuhealth/Dockerfile b/gnuhealth/Dockerfile
index 1d05802..3f1fd39 100644
--- a/gnuhealth/Dockerfile
+++ b/gnuhealth/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
 RUN \
diff --git a/java/Dockerfile b/java/Dockerfile
index 12d91a8..29fd531 100644
--- a/java/Dockerfile
+++ b/java/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
 RUN \
diff --git a/kanboard/Dockerfile b/kanboard/Dockerfile
index 1d034b2..87bfcec 100644
--- a/kanboard/Dockerfile
+++ b/kanboard/Dockerfile
@@ -1,9 +1,9 @@
-FROM alpine:3.7
+FROM alpine
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
 RUN \
  # Install PHP runtime
- apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session s6
+ apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session
 
 RUN \
  # Install runtime dependencies
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index 2a3f965..050c87e 100644
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
 RUN \
@@ -6,7 +6,7 @@ RUN \
  addgroup -S -g 3306 mysql \
  && adduser -S -u 3306 -h /var/lib/mysql -s /bin/nologin -g mysql -G mysql mysql \
  # Install MariaDB
- && apk --no-cache add mariadb mariadb-client s6 \
+ && apk --no-cache add mariadb mariadb-client \
  # Create socket directory
  && mkdir /run/mysqld \
  && chown mysql:mysql /run/mysqld
diff --git a/opendatakit-build/Dockerfile b/opendatakit-build/Dockerfile
index df9aef9..f8c7a9f 100644
--- a/opendatakit-build/Dockerfile
+++ b/opendatakit-build/Dockerfile
@@ -11,7 +11,7 @@ RUN \
 
 RUN \
  # Install runtime dependencies
- apk --no-cache add libpq s6
+ apk --no-cache add libpq
 
 RUN \
  # Install build dependencies for ODK Build
diff --git a/openmapkit/Dockerfile b/openmapkit/Dockerfile
index 160604b..04f80a2 100644
--- a/openmapkit/Dockerfile
+++ b/openmapkit/Dockerfile
@@ -11,7 +11,7 @@ RUN \
 
 RUN \
  # Install runtime dependencies
- apk --no-cache add python2 s6
+ apk --no-cache add python2
 
 RUN \
  # Install build dependencies
diff --git a/pandora/Dockerfile b/pandora/Dockerfile
index ea99230..0757ec3 100644
--- a/pandora/Dockerfile
+++ b/pandora/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
 RUN \
@@ -12,7 +12,7 @@ RUN \
 
 RUN \
  # Install runtime dependencies
- apk --no-cache add ffmpeg imagemagick imlib2 libogg libtheora libvpx mkvtoolnix nginx poppler-utils py3-geoip py3-lxml py3-numpy py3-pillow py3-psycopg2 s6 \
+ apk --no-cache add ffmpeg imagemagick imlib2 libogg libtheora libvpx mkvtoolnix nginx poppler-utils py3-geoip py3-lxml py3-numpy py3-pillow py3-psycopg2 \
  && pip3 install pyinotify youtube-dl
 
 RUN \
diff --git a/postfix/Dockerfile b/postfix/Dockerfile
index 12ea906..53f4e5f 100644
--- a/postfix/Dockerfile
+++ b/postfix/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
 RUN \
@@ -8,7 +8,7 @@ RUN \
  # Add edge/main repository
  && echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' >>/etc/apk/repositories \
  # Install Postfix 3.3
- && apk --no-cache add ca-certificates postfix@edge s6 \
+ && apk --no-cache add ca-certificates postfix@edge \
  # Build aliases database
  && newaliases \
  # Cleanup
diff --git a/ruby/Dockerfile b/ruby/Dockerfile
index d74012e..9798fb0 100644
--- a/ruby/Dockerfile
+++ b/ruby/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
 RUN \
diff --git a/sahana.sh b/sahana.sh
index 46a9f06..41c4efe 100755
--- a/sahana.sh
+++ b/sahana.sh
@@ -5,6 +5,7 @@ SOURCE_DIR=$(realpath $(dirname "${0}"))/sahana
 # Check prerequisites
 docker image ls | grep -q postfix || $(realpath $(dirname "${0}"))/postfix.sh
 docker image ls | grep -q postgres || $(realpath $(dirname "${0}"))/postgres.sh
+docker image ls | grep -q python2 || $(realpath $(dirname "${0}"))/python2.sh
 service postgres start
 
 # Build Docker container
diff --git a/sahana/Dockerfile b/sahana/Dockerfile
index 31c3e03..88e8a37 100644
--- a/sahana/Dockerfile
+++ b/sahana/Dockerfile
@@ -1,19 +1,11 @@
-FROM alpine:3.7
+FROM python2
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
-RUN \
- # Install Python2 runtime
- apk --no-cache add python2
-
-RUN \
- # Install runtime XML dependencies
- apk --no-cache add libxml2 libxslt
-
 RUN \
  # Add edge/testing repository
  echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
  # Install runtime dependencies
- && apk --no-cache add geos@edge nginx py-gdal@edge py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests s6 uwsgi-python
+ && apk --no-cache add geos@edge nginx py-gdal@edge py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python
 
 RUN \
  # Install build dependencies
diff --git a/seeddms/Dockerfile b/seeddms/Dockerfile
index 61f8a85..61400c4 100644
--- a/seeddms/Dockerfile
+++ b/seeddms/Dockerfile
@@ -1,9 +1,9 @@
-FROM alpine:3.7
+FROM alpine
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
 RUN \
  # Install PHP runtime
- apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session s6
+ apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session
 
 RUN \
  # Install runtime dependencies
diff --git a/ushahidi/Dockerfile b/ushahidi/Dockerfile
index 57e4d66..bbaa089 100644
--- a/ushahidi/Dockerfile
+++ b/ushahidi/Dockerfile
@@ -1,9 +1,9 @@
-FROM alpine:3.7
+FROM alpine
 MAINTAINER Disassembler <disassembler@dasm.cz>
 
 RUN \
  # Install PHP runtime
- apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session s6
+ apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session
 
 RUN \
  # Install runtime dependencies