diff --git a/casperjs/Dockerfile b/casperjs/Dockerfile
index cc96b32..fb44e45 100644
--- a/casperjs/Dockerfile
+++ b/casperjs/Dockerfile
@@ -5,24 +5,28 @@
 FROM debian:jessie
 MAINTAINER kev <noreply@datageek.info>
 
-ENV PHANTOM_URL https://github.com/vimagick/dockerfiles/raw/master/webkit/bin/phantomjs
+ENV PHANTOM_URL https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
+ENV PHANTOM_DIR /usr/local/bin
 ENV CASPER_URL https://github.com/n1k0/casperjs/archive/master.tar.gz
-ENV CASPER_DIR /usr/local/casperjs/
+ENV CASPER_DIR /usr/local/casperjs
 
-RUN apt-get update \
-    && apt-get install -y curl \
+RUN set -xe \
+    && apt-get update \
+    && apt-get install -y bzip2 \
+                          curl \
                           libfontconfig \
                           libicu52 \
+                          libsqlite3-0 \
                           python \
-    && curl -sSL $PHANTOM_URL -o /usr/local/bin/phantomjs \
+    && curl -sSL $PHANTOM_URL | tar xj -C $PHANTOM_DIR --strip 2 --wildcards '*/bin/phantomjs' \
     && chmod +x /usr/local/bin/phantomjs \
     && mkdir -p $CASPER_DIR \
     && curl -sSL $CASPER_URL | tar xz --strip 1 -C $CASPER_DIR \
-    && sed -i '/Warning PhantomJS v2.0 not yet released/s@^@//@' $CASPER_DIR/bin/bootstrap.js \
     && ln -sf $CASPER_DIR/bin/casperjs /usr/local/bin/ \
+    && apt-get remove -y bzip2 \
+                         curl \
     && rm -rf /var/lib/apt/lists/*
 
-COPY ./libjpeg.so.8 /usr/lib/x86_64-linux-gnu/
 COPY ./sample.js /app/
 
 VOLUME /app/
diff --git a/casperjs/libjpeg.so.8 b/casperjs/libjpeg.so.8
deleted file mode 100644
index 634cbf9..0000000
Binary files a/casperjs/libjpeg.so.8 and /dev/null differ
diff --git a/ghost/arm/Dockerfile b/ghost/arm/Dockerfile
index 8793d5d..073b2be 100644
--- a/ghost/arm/Dockerfile
+++ b/ghost/arm/Dockerfile
@@ -5,7 +5,7 @@
 FROM vimagick/alpine-arm
 MAINTAINER kev <noreply@datageek.info>
 
-ENV GHOST_VER 0.7.5
+ENV GHOST_VER 0.7.6
 ENV GHOST_URL https://ghost.org/archives/ghost-$GHOST_VER.zip
 ENV GHOST_SOURCE /usr/src/ghost
 ENV GHOST_CONTENT /var/lib/ghost
diff --git a/tinc/Dockerfile b/tinc/Dockerfile
index bedcb30..e1f7c39 100644
--- a/tinc/Dockerfile
+++ b/tinc/Dockerfile
@@ -3,7 +3,7 @@
 #
 
 FROM alpine
-MAINTAINER kev <noreply@datageek.inf>
+MAINTAINER kev <noreply@datageek.info>
 
 ENV NETNAME=netname \
     PIDFILE=/run/tinc.$NETNAME.pid \
diff --git a/tinc/Dockerfile.debian b/tinc/Dockerfile.debian
index 8cbf97d..3278517 100644
--- a/tinc/Dockerfile.debian
+++ b/tinc/Dockerfile.debian
@@ -3,7 +3,7 @@
 #
 
 FROM debian:jessie
-MAINTAINER kev <noreply@datageek.inf>
+MAINTAINER kev <noreply@datageek.info>
 
 ENV NETNAME netname
 ENV PIDFILE /run/tinc.$NETNAME.pid