diff --git a/ghost/Dockerfile b/ghost/Dockerfile
index 3178c72..f918953 100644
--- a/ghost/Dockerfile
+++ b/ghost/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 ARG GHOST_VERSION=0.11.9
 
@@ -34,6 +34,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
     tini@commuedge \
     su-exec \
     nodejs \
+    nodejs-npm \
  && wget -q https://github.com/TryGhost/Ghost/releases/download/${GHOST_VERSION}/Ghost-${GHOST_VERSION}.zip -P /tmp \
  && unzip -q /tmp/Ghost-${GHOST_VERSION}.zip -d /ghost \
  && cd /ghost \
diff --git a/isso/Dockerfile b/isso/Dockerfile
index 5d5c987..46fc222 100644
--- a/isso/Dockerfile
+++ b/isso/Dockerfile
@@ -1,29 +1,28 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 ARG ISSO_VER=0.10.6
 
 ENV GID=1000 UID=1000
 
-RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/apk/repositories \
- && BUILD_DEPS=" \
+RUN apk -U upgrade \
+ && apk add -t build-dependencies \
     python-dev \
     libffi-dev \
     py2-pip \
-    build-base" \
- && apk -U add \
-    ${BUILD_DEPS} \
+    build-base \
+ && apk add \
     python \
     py-setuptools \
     sqlite \
     libressl \
     ca-certificates \
     su-exec \
-    tini@community \
+    tini \
  && pip install --no-cache cffi \
  && pip install --no-cache misaka==1.0.2 \
  && pip install --no-cache "isso==${ISSO_VER}" \
- && apk del ${BUILD_DEPS} \
- && rm -rf /var/cache/apk/* /tmp/*
+ && apk del build-dependencies \
+ && rm -rf /tmp/* /var/cache/apk/*
 
 COPY run.sh /usr/local/bin/run.sh
 
diff --git a/libresonic/Dockerfile b/libresonic/Dockerfile
index a288396..e6d927f 100644
--- a/libresonic/Dockerfile
+++ b/libresonic/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 ARG VERSION=6.2
 
@@ -6,14 +6,14 @@ ENV UID=991 GID=991
 
 WORKDIR /libresonic
 
-RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/apk/repositories \
+RUN echo "@community https://nl.alpinelinux.org/alpine/v3.6/community" >> /etc/apk/repositories \
  && apk -U upgrade && apk add \
     ffmpeg \
     su-exec \
     libressl \
     ca-certificates \
     openjdk8-jre@community \
-    tini@community \
+    tini \
  && wget -q https://github.com/Libresonic/libresonic/releases/download/v${VERSION}/libresonic-v${VERSION}.war -O libresonic.war \
  && rm -f /var/cache/apk/*
 
@@ -25,8 +25,8 @@ EXPOSE 4040
 
 VOLUME /data /musics /playlists /podcasts
 
-LABEL description "Open source media streamer" \
-      libresonic "Libresonic v$VERSION" \
+LABEL description="Open source media streamer" \
+      libresonic="Libresonic v$VERSION" \
       maintainer="Wonderfall <wonderfall@targaryen.house>"
 
 CMD ["run.sh"]
diff --git a/pgbouncer/Dockerfile b/pgbouncer/Dockerfile
index 3e86d2b..ee04597 100644
--- a/pgbouncer/Dockerfile
+++ b/pgbouncer/Dockerfile
@@ -1,15 +1,16 @@
-FROM alpine:edge
+FROM alpine:3.6
 
 ENV UID=991 GID=991
 
-RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && apk -U add pgbouncer@testing tini su-exec \
- && rm -rf /var/cache/apk/*
+RUN apk -U --no-cache add \
+    pgbouncer \
+    tini \
+    su-exec
 
 COPY run.sh /usr/local/bin/run.sh
 
 RUN chmod +x /usr/local/bin/run.sh
 
-VOLUME /config
+VOLUME /etc/pgbouncer
 
-CMD ["/sbin/tini","--","run.sh"]
+CMD ["run.sh"]
diff --git a/pgbouncer/README.md b/pgbouncer/README.md
new file mode 100644
index 0000000..76e3be0
--- /dev/null
+++ b/pgbouncer/README.md
@@ -0,0 +1,10 @@
+## wonderfall/pgbouncer
+
+Minimal image for [PgBouncer](https://pgbouncer.github.io/).
+
+### Volumes
+- /etc/pgbouncer
+
+### Environment variables
+- **GID** : user id *(default : 991)*
+- **UID** : group id *(default : 991)*
diff --git a/pgbouncer/run.sh b/pgbouncer/run.sh
index 9fe174e..86eaa2d 100644
--- a/pgbouncer/run.sh
+++ b/pgbouncer/run.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 mkdir /run/pgbouncer
 chown -R $UID:$GID /etc/pgbouncer /var/log/pgbouncer /run/pgbouncer
-su-exec $UID:$GID pgbouncer /etc/pgbouncer/pgbouncer.ini
+exec su-exec $UID:$GID /sbin/tini -- pgbouncer /etc/pgbouncer/pgbouncer.ini
diff --git a/searx/Dockerfile b/searx/Dockerfile
index 2d18df5..206aa48 100644
--- a/searx/Dockerfile
+++ b/searx/Dockerfile
@@ -1,10 +1,10 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 ENV BASE_URL=False IMAGE_PROXY=False \
     UID=991 GID=991
 
-RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/apk/repositories \
- && BUILD_DEPS=" \
+RUN apk -U upgrade \
+ && apk add -t build-dependencies \
     build-base \
     python-dev \
     libffi-dev \
@@ -12,21 +12,20 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/a
     libxml2-dev \
     openssl-dev \
     tar \
-    ca-certificates" \
- && apk -U add \
-    ${BUILD_DEPS} \
+    ca-certificates \
+ && apk add \
     su-exec \
     python \
     libxml2 \
     libxslt \
     openssl \
-    tini@community \
+    tini \
     py2-pip \
  && pip install --no-cache -r https://raw.githubusercontent.com/asciimoo/searx/master/requirements.txt \
  && mkdir /usr/local/searx && cd /usr/local/searx \
  && wget -qO- https://github.com/asciimoo/searx/archive/master.tar.gz | tar xz --strip 1 \
  && sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml \
- && apk del ${BUILD_DEPS} \
+ && apk del build-dependencies \
  && rm -f /var/cache/apk/*
 
 COPY run.sh /usr/local/bin/run.sh