diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..397b4a7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.log
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 2d0b195..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-language: bash
-services: docker
-sudo: false
-
-env:
-  global:
-    - PROJECT=node
-    - NAMESPACE=makeomatic
-    - PUSH_NAMESPACES=makeomatic
-    - BASE_NAME=makeomatic/node
-
-install:
-  - curl -sSL https://github.com/makeomatic/ci-scripts/raw/master/install.sh | sh -s
-  - git clone https://github.com/docker-library/official-images.git ~/official-images
-
-before_script:
-  - |
-    export PATH=$PATH:~/ci-scripts
-    [ ${TRAVIS_BRANCH} == master ] || export variant=${TRAVIS_BRANCH}
-script:
-  - |
-    # build base node images that are used further in the project
-    docker-build -v "${variant}" $BASE_NAME -f node/Dockerfile . || exit $?
-    docker-build -v "${variant}-onbuild" $BASE_NAME -f node/Dockerfile.onbuild . || exit $?
-    docker-build -v "${variant}-tester" $BASE_NAME -f node/Dockerfile.tester . || exit $?
-    docker-build -v "${variant}-tester-glibc" $BASE_NAME -f node/Dockerfile.tester-glibc . || exit $?
-    # build node images with ruby
-    docker-build -v "${variant}-ruby" $BASE_NAME -f node-ruby/Dockerfile . || exit $?
-    # build node images with ssh embedded
-    docker-build -v "${variant}-ssh" $BASE_NAME -f node-ssh/Dockerfile . || exit $?
-    docker-build -v "${variant}-ssh-onbuild" $BASE_NAME -f node-ssh/Dockerfile.onbuild . || exit $?
-    # build node images with libvips
-    docker-build -v "${variant}-vips" $BASE_NAME -f node-vips/Dockerfile . || exit $?
-    docker-build -v "${variant}-vips-onbuild" $BASE_NAME -f node-vips/Dockerfile.onbuild . || exit $?
-    docker-build -v "${variant}-vips-tester-glibc" $BASE_NAME -f node-vips/Dockerfile.tester-glibc . || exit $?
-    # build node images with libvips & ssh
-    docker-build -v "${variant}-vips-ssh" $BASE_NAME -f node-vips-ssh/Dockerfile . || exit $?
-    docker-build -v "${variant}-vips-ssh-onbuild" $BASE_NAME -f node-vips-ssh/Dockerfile.onbuild . || exit $?
-
-after_success:
-  - |
-    # Check if not PR and namespace (org or user) is in the push list PUSH_NAMESPACES.
-    [ "${TRAVIS_PULL_REQUEST}" = "false" ] && ( echo "${PUSH_NAMESPACES}" | grep -qw "${TRAVIS_REPO_SLUG%/*}" )
-    [ $? -eq 0 ] || exit 0
-    # List of newly created images
-    export images=$(docker images | grep "^$BASE_NAME" | tr -s '[:space:]' | cut -f1,2 -d' ' | sed 's/ /:/')
-    # Push to docker when DEPLOY is true
-    docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-    for image in $images; do docker push $image; done
-after_script:
-  - docker images
diff --git a/README.md b/README.md
index 9a247b1..1935f12 100644
--- a/README.md
+++ b/README.md
@@ -7,11 +7,11 @@
 Contains the following base images:
 
 * node versions:
-  - 6.7.0
-  - 6.7.0-ssh (with openssh installed)
-  - 6.7.0-vips (with libvips installed)
-  - 6.7.0-vips-ssh (ssh+vips)
-  - 6.7.0-ruby (with ruby 2.3.1 installed)
+  - 6.9.1
+  - 6.9.1-ssh (with openssh installed)
+  - 6.9.1-vips (with libvips installed)
+  - 6.9.1-vips-ssh (ssh+vips)
+  - 6.9.1-ruby (with ruby 2.3.1 installed)
 
 ## Currently disabled
 
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..d2dfebb
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+set -e
+
+#set the DEBUG env variable to turn on debugging
+[[ -n "$DEBUG" ]] && set -x
+
+# global env vars
+export \
+  PROJECT=node \
+  NAMESPACE=makeomatic \
+  PUSH_NAMESPACES=makeomatic \
+  BASE_NAME=makeomatic/node
+
+BRANCH_NAME=${BRANCH_NAME:-$(git branch | grep  ^*|cut -d" " -f2)}
+echo "working in $BRANCH_NAME"
+BRANCH_NAME=$(echo $BRANCH_NAME | sed -e "s/\//-/g")
+echo "tagging as $BRANCH_NAME"
+
+# install basic scripts
+curl -sSL https://github.com/makeomatic/ci-scripts/raw/master/install.sh | sh -s
+[ -d ~/official-images ] || git clone https://github.com/docker-library/official-images.git ~/official-images
+
+# add scripts to PATH
+export PATH=$PATH:~/ci-scripts
+
+# cleanup logs
+rm -rf ./*.log
+
+# build base node images that are used further in the project
+docker-build $BASE_NAME -f node/Dockerfile .
+docker-build -v "onbuild" $BASE_NAME -f node/Dockerfile.onbuild .
+docker-build -v "tester" $BASE_NAME -f node/Dockerfile.tester .
+docker-build -v "tester-glibc" $BASE_NAME -f node/Dockerfile.tester-glibc .
+# build node images with ruby
+docker-build -v "ruby" $BASE_NAME -f node-ruby/Dockerfile .
+# build node images with ssh embedded
+docker-build -v "ssh" $BASE_NAME -f node-ssh/Dockerfile .
+docker-build -v "ssh-onbuild" $BASE_NAME -f node-ssh/Dockerfile.onbuild .
+# build node images with libvips
+docker-build -v "vips" $BASE_NAME -f node-vips/Dockerfile .
+docker-build -v "vips-onbuild" $BASE_NAME -f node-vips/Dockerfile.onbuild .
+docker-build -v "vips-tester-glibc" $BASE_NAME -f node-vips/Dockerfile.tester-glibc .
+# build node images with libvips & ssh
+docker-build -v "vips-ssh" $BASE_NAME -f node-vips-ssh/Dockerfile .
+docker-build -v "vips-ssh-onbuild" $BASE_NAME -f node-vips-ssh/Dockerfile.onbuild .
+
+# List of newly created images
+images=$(docker images $BASE_NAME | tr -s '[:space:]' | cut -f1,2 -d' ' | sed 's/ /:/')
+
+# we actually need to
+# Push to docker when DEPLOY is true
+[ ${BRANCH_NAME} = master ] && for image in $images; do docker push $image; done
+
+# report
+docker images $BASE_NAME
diff --git a/libvips-apk/.dockerignore b/libvips-apk/.dockerignore
deleted file mode 100644
index 1d1fe94..0000000
--- a/libvips-apk/.dockerignore
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile
\ No newline at end of file
diff --git a/libvips-apk/APKBUILD b/libvips-apk/APKBUILD
deleted file mode 100644
index 3dbe498..0000000
--- a/libvips-apk/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Vitaly Aminev <v@makeomatic.ru>
-# Maintainer: Vitaly Aminev <v@makeomatic.ru>
-pkgname=libvips
-pkgver=8.3.1
-pkgrel=0
-pkgdesc="libvips"
-url="https://github.com/jcupitt/libvips"
-arch="noarch"
-license="LGPL"
-depends="gettext glib libxml2 libjpeg-turbo libpng libexif giflib librsvg tiff lcms2 libwebp"
-makedepends="build-base pkgconfig glib-dev libxml2-dev libjpeg-turbo-dev libpng-dev libexif-dev giflib-dev librsvg-dev tiff-dev lcms2-dev libwebp-dev"
-install=""
-subpackages=""
-source="$pkgname-$pkgver.tar.gz::http://www.vips.ecs.soton.ac.uk/supported/current/vips-$pkgver.tar.gz"
-
-builddir="$srcdir/vips-$pkgver"
-build() {
-	cd "$builddir"
-	CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" ./configure \
-		--disable-debug \
-		--disable-static \
-		--disable-introspection \
-		--disable-dependency-tracking \
-		--without-python \
-		--without-orc \
-		--without-fftw || exit 1
-	make -j4 || exit 1
-	return 0
-}
-
-package() {
-	mkdir -p "$pkgdir"
-	cd "$builddir"
-	echo "BUILDING in $pkgdir"
-	make install DESTDIR="$pkgdir" || exit 1
-	return 0
-}
-
-md5sums="1213f9a4286dad44790cf90838c229a5  libvips-8.3.1.tar.gz"
-sha256sums="09cb7f8d5640c7693bae07080202de0cead60c668e086f2739248bacd40a1006  libvips-8.3.1.tar.gz"
-sha512sums="0ba378015b85688f173be59d76655fc33a6704e8bad4bc91261c3e5d4851a288e1c083718b2a03076fd2d9069c9ee6110780ae64b4d22e49ba68fa3cacece212  libvips-8.3.1.tar.gz"
diff --git a/libvips-apk/Dockerfile b/libvips-apk/Dockerfile
deleted file mode 100644
index 97469ee..0000000
--- a/libvips-apk/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM alpine:3.4
-
-ARG HTTP_PROXY
-ENV USERNAME alpine-sdk
-
-RUN \
-    apk --update add alpine-sdk \
-    && addgroup -S ${USERNAME} \
-    && adduser -S -h /home/${USERNAME} ${USERNAME} \
-    && echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
-    && addgroup ${USERNAME} abuild
-
-COPY etc/ /etc/
-USER $USERNAME
-RUN \
-  sudo chown -R ${USERNAME}:${USERNAME} /home/${USERNAME} \
-  && sudo addgroup ${USERNAME} abuild \
-  && sudo mkdir -p /var/cache/distfiles \
-  && sudo chgrp abuild /var/cache/distfiles \
-  && sudo chmod g+w /var/cache/distfiles \
-  && abuild-keygen -a -i -n
-
-WORKDIR /home/${USERNAME}
-ENV LIBVIPS_VERSION=8.3.1 \
-    LIBVIPS_SHA256=09cb7f8d5640c7693bae07080202de0cead60c668e086f2739248bacd40a1006
-
-COPY APKBUILD /home/${USERNAME}/libvips/
-RUN sudo chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}
-
-# RUN cd libvips && abuild -r -u
diff --git a/libvips-apk/etc/abuild.conf b/libvips-apk/etc/abuild.conf
deleted file mode 100644
index 1bf6367..0000000
--- a/libvips-apk/etc/abuild.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-CHOST=x86_64-alpine-linux-musl
-
-# for x86_64 we want:
-# CHOST=x86_64-alpine-linux-musl
-
-# for powerpc we want:
-# CHOST=powerpc-alpine-linux-musl
-
-export CFLAGS="-Os -fomit-frame-pointer"
-export CXXFLAGS="$CFLAGS"
-export CPPFLAGS="$CFLAGS"
-export LDFLAGS="-Wl,--as-needed"
-
-export JOBS=4
-export MAKEFLAGS=-j$JOBS
-
-# remove line below to disable colors
-USE_COLORS=1
-
-SRCDEST=/var/cache/distfiles
-
-# uncomment line below to store built packages in other location
-# The package will be stored as $REPODEST/$repo/$pkgname-$pkgver-r$pkgrel.apk
-# where $repo is the name of the parent directory of $startdir.
-REPODEST=$HOME/packages/
-
-# PACKAGER and MAINTAINER are used by newapkbuild when creating new aports for
-# the APKBUILD's "Contributor:" and "Maintainer:" comments, respectively.
-PACKAGER="Vitaly Aminev <v@makeomatic.ru>"
-MAINTAINER="$PACKAGER"
-
-# what to clean up after a successful build
-CLEANUP="srcdir pkgdir deps"
-
-# what to cleanup after a failed build
-ERROR_CLEANUP="deps"
diff --git a/node-ruby/Dockerfile b/node-ruby/Dockerfile
index 91bdadf..d267662 100644
--- a/node-ruby/Dockerfile
+++ b/node-ruby/Dockerfile
@@ -1,9 +1,9 @@
 FROM alpine:3.4
 
 LABEL vendor=makeomatic \
-      version_tags="[\"6\",\"6.7.0\"]"
+      version_tags="[\"6\",\"6.9.1\"]"
 
-ENV NODE_VERSION=v6.7.0 \
+ENV NODE_VERSION=v6.9.1 \
     NPM_VERSION=3 \
     NODE_HOME=/usr/local \
     RUBY_MAJOR=2.3 \
@@ -27,7 +27,7 @@ RUN \
     echo 'update: --no-document'; \
   } >> /usr/local/etc/gemrc \
   && set -ex \
-  && apk add --no-cache --update --virtual .builddeps \
+  && apk add --no-cache --virtual .builddeps \
     bison \
     bzip2 \
     bzip2-dev \
@@ -75,6 +75,7 @@ RUN \
     ./configure --disable-install-doc \
   && make -j"$(getconf _NPROCESSORS_ONLN)" \
   && make install \
+  && gem update --system $RUBYGEMS_VERSION \
   && cd / \
   && curl -sSL https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}.tar.gz | tar -xz \
   && cd /node-${NODE_VERSION} \
@@ -96,7 +97,6 @@ RUN \
   )" \
   && apk add --virtual .rundeps $runDeps \
   && apk del .builddeps \
-  && gem update --system $RUBYGEMS_VERSION \
   && rm -rf /node-${NODE_VERSION} \
     /usr/src/ruby \
     /usr/share/man /tmp/* /root/.npm /root/.node-gyp \
diff --git a/node-ssh/Dockerfile b/node-ssh/Dockerfile
index ee4891e..f2e26da 100644
--- a/node-ssh/Dockerfile
+++ b/node-ssh/Dockerfile
@@ -1,50 +1,7 @@
-FROM alpine:3.4
-
-LABEL vendor=makeomatic \
-      version_tags="[\"6\",\"6.7.0\"]"
-
-ENV NODE_VERSION=v6.7.0 \
-    NPM_VERSION=3 \
-    NODE_HOME=/usr/local
+FROM makeomatic/node:6.9.1
 
+# add extra packages
 RUN \
-  apk add --no-cache --update --virtual .node-buildDeps \
-    git \
-    curl \
-    make \
-    gcc \
-    g++ \
-    binutils-gold \
-    python \
-    linux-headers \
-    paxctl \
-    libgcc \
-    libstdc++ \
+  apk add --no-cache --virtual .flavorDeps \
     openssh \
-  && curl -sSL https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}.tar.gz | tar -xz \
-  && cd /node-${NODE_VERSION} \
-  && ./configure --prefix=${NODE_HOME} ${CONFIG_FLAGS} \
-  && make -j$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
-  && make install \
-  && paxctl -cm ${NODE_HOME}/bin/node \
-  && cd / \
-  && if [ -x ${NODE_HOME}/bin/npm ]; then \
-    npm install -g npm@${NPM_VERSION} && \
-    find ${NODE_HOME}/lib/node_modules/npm -name test -o -name .bin -type d | xargs rm -rf; \
-  fi \
-  && runDeps="$( \
-    scanelf --needed --nobanner --recursive /usr/local \
-      | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
-      | sort -u \
-      | xargs -r apk info --installed \
-      | sort -u \
-  )" \
-  && apk add --virtual .rundeps $runDeps \
-  && apk add --virtual .flavorDeps openssh git \
-  && apk del .node-buildDeps \
-  && rm -rf /node-${NODE_VERSION} \
-    ${NODE_HOME}/share/man /tmp/* /root/.npm /root/.node-gyp \
-    ${NODE_HOME}/lib/node_modules/npm/man ${NODE_HOME}/lib/node_modules/npm/doc ${NODE_HOME}/lib/node_modules/npm/html \
-  && adduser -S node
-
-CMD [ "npm", "start" ]
+    git
diff --git a/node-ssh/Dockerfile.onbuild b/node-ssh/Dockerfile.onbuild
index c5743c2..469963b 100644
--- a/node-ssh/Dockerfile.onbuild
+++ b/node-ssh/Dockerfile.onbuild
@@ -1,4 +1,4 @@
-FROM makeomatic/node:6.7.0-ssh
+FROM makeomatic/node:6.9.1-ssh
 
 # copy stuff in
 ONBUILD WORKDIR /src
diff --git a/node-vips-ssh/Dockerfile b/node-vips-ssh/Dockerfile
index 8a50e50..ea6c082 100644
--- a/node-vips-ssh/Dockerfile
+++ b/node-vips-ssh/Dockerfile
@@ -1,52 +1,5 @@
-FROM alpine:3.4
+FROM makeomatic/node:6.9.1-vips
 
-LABEL vendor=makeomatic \
-      version_tags="[\"6\",\"6.7.0\"]"
-
-ENV NODE_VERSION=v6.7.0 \
-    NPM_VERSION=3 \
-    NODE_HOME=/usr/local
-
-RUN \
-  printf "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA29qkaf8HSeDwWO8MNipl\nPsiCdwETf9QK/k5ZoUyCF6xtBYg4BFcfAjdyzP5+uJmdIIfyWbrw8D7QCNVlSqTh\nzL4vm3X3ezLYdbm+QTr12aXLafJQI1FVvU+pRK3zsI0E2tjgLKdLBTLAe/aIzPbS\nLmsKPym/T3e2nNngyw+csvuLSQusgSrsiOt/6FZYFUMqTh2P6wfv+CHqyyqy3kK6\nQof/BWeX1aWisJYt/9nyXGJSyvi4KlxVrD6KIcw1mB4+UsN1VlK3YPBSHbA37y6D\nlhJd5rr47YqmQUyr+ooFQ0DGXVXJ/zDq8PiTq5dTvgwcMZAHt96W2gY0UFxt0waZ\nWwIDAQAB\n-----END PUBLIC KEY-----\n" > /etc/apk/keys/v@aminev.me-57586a31.rsa.pub \
-  && apk add --no-cache --update --virtual .node-buildDeps \
-    git \
-    curl \
-    make \
-    gcc \
-    g++ \
-    binutils-gold \
-    python \
-    linux-headers \
-    paxctl \
-    libgcc \
-    libstdc++ \
-    openssh \
-  && curl -sSL https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}.tar.gz | tar -xz \
-  && cd /node-${NODE_VERSION} \
-  && ./configure --prefix=${NODE_HOME} ${CONFIG_FLAGS} \
-  && make -j$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
-  && make install \
-  && paxctl -cm ${NODE_HOME}/bin/node \
-  && cd / \
-  && if [ -x ${NODE_HOME}/bin/npm ]; then \
-    npm install -g npm@${NPM_VERSION} && \
-    find ${NODE_HOME}/lib/node_modules/npm -name test -o -name .bin -type d | xargs rm -rf; \
-  fi \
-  && runDeps="$( \
-    scanelf --needed --nobanner --recursive /usr/local \
-      | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
-      | sort -u \
-      | xargs -r apk info --installed \
-      | sort -u \
-  )" \
-  && apk add --virtual .rundeps $runDeps \
-  && apk add --virtual .flavorDeps openssh git \
-  && apk del .node-buildDeps \
-  && rm -rf /node-${NODE_VERSION} \
-    ${NODE_HOME}/share/man /tmp/* /root/.npm /root/.node-gyp \
-    ${NODE_HOME}/lib/node_modules/npm/man ${NODE_HOME}/lib/node_modules/npm/doc ${NODE_HOME}/lib/node_modules/npm/html \
-  && adduser -S node \
-  && apk add libvips --no-cache --update --repository http://cdn.matic.ninja/apk/community
-
-CMD [ "npm", "start" ]
+RUN apk add --no-cache --virtual .flavorDeps \
+  openssh \
+  git
diff --git a/node-vips-ssh/Dockerfile.onbuild b/node-vips-ssh/Dockerfile.onbuild
index b7b0c46..21f2dc3 100644
--- a/node-vips-ssh/Dockerfile.onbuild
+++ b/node-vips-ssh/Dockerfile.onbuild
@@ -1,18 +1,17 @@
-FROM makeomatic/node:6.7.0-vips-ssh
+FROM makeomatic/node:6.9.1-vips-ssh
 
 ONBUILD WORKDIR /src
 
 ONBUILD COPY package.json .
 ONBUILD COPY ./keys/* /tmp/.ssh/
 ONBUILD RUN \
-  apk add --no-cache g++ make git \
-  && apk add libvips-dev --no-cache --update --repository http://cdn.matic.ninja/apk/community \
+  apk add --no-cache --virtual .buildDeps \
+    g++ \
+    make \
+    vips-dev@testing \
   && GIT_SSH_COMMAND="ssh -i /tmp/.ssh/id_rsa -F /dev/null" npm install --production \
   && npm dedupe \
   && apk del .buildDeps .flavorDeps \
-    libvips-dev \
-    g++ \
-    make \
   && rm -rf \
     /root/.npm \
     /root/.node-gyp \
diff --git a/node-vips/Dockerfile b/node-vips/Dockerfile
index 4ba2e6f..3cba151 100644
--- a/node-vips/Dockerfile
+++ b/node-vips/Dockerfile
@@ -1,50 +1,6 @@
-FROM alpine:3.4
-
-LABEL vendor=makeomatic \
-      version_tags="[\"6\",\"6.7.0\"]"
-
-ENV NODE_VERSION=v6.7.0 \
-    NPM_VERSION=3.9.6 \
-    NODE_HOME=/usr/local
+FROM makeomatic/node:6.9.1
 
+# add libvips
 RUN \
-  printf "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA29qkaf8HSeDwWO8MNipl\nPsiCdwETf9QK/k5ZoUyCF6xtBYg4BFcfAjdyzP5+uJmdIIfyWbrw8D7QCNVlSqTh\nzL4vm3X3ezLYdbm+QTr12aXLafJQI1FVvU+pRK3zsI0E2tjgLKdLBTLAe/aIzPbS\nLmsKPym/T3e2nNngyw+csvuLSQusgSrsiOt/6FZYFUMqTh2P6wfv+CHqyyqy3kK6\nQof/BWeX1aWisJYt/9nyXGJSyvi4KlxVrD6KIcw1mB4+UsN1VlK3YPBSHbA37y6D\nlhJd5rr47YqmQUyr+ooFQ0DGXVXJ/zDq8PiTq5dTvgwcMZAHt96W2gY0UFxt0waZ\nWwIDAQAB\n-----END PUBLIC KEY-----\n" > /etc/apk/keys/v@aminev.me-57586a31.rsa.pub \
-  && apk add --no-cache --update --virtual .node-buildDeps \
-    git \
-    curl \
-    make \
-    gcc \
-    g++ \
-    binutils-gold \
-    python \
-    linux-headers \
-    paxctl \
-    libgcc \
-    libstdc++ \
-  && curl -sSL https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}.tar.gz | tar -xz \
-  && cd /node-${NODE_VERSION} \
-  && ./configure --prefix=${NODE_HOME} ${CONFIG_FLAGS} \
-  && make -j$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
-  && make install \
-  && paxctl -cm ${NODE_HOME}/bin/node \
-  && cd / \
-  && if [ -x ${NODE_HOME}/bin/npm ]; then \
-    npm install -g npm@${NPM_VERSION} && \
-    find ${NODE_HOME}/lib/node_modules/npm -name test -o -name .bin -type d | xargs rm -rf; \
-  fi \
-  && runDeps="$( \
-    scanelf --needed --nobanner --recursive /usr/local \
-      | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
-      | sort -u \
-      | xargs -r apk info --installed \
-      | sort -u \
-  )" \
-  && apk add --virtual .rundeps $runDeps \
-  && apk del .node-buildDeps \
-  && rm -rf /node-${NODE_VERSION} \
-    ${NODE_HOME}/share/man /tmp/* /root/.npm /root/.node-gyp \
-    ${NODE_HOME}/lib/node_modules/npm/man ${NODE_HOME}/lib/node_modules/npm/doc ${NODE_HOME}/lib/node_modules/npm/html \
-  && adduser -S node \
-  && apk add libvips --no-cache --update --repository http://cdn.matic.ninja/apk/community
-
-CMD [ "npm", "start" ]
+  echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
+  && apk add --no-cache vips@testing
diff --git a/node-vips/Dockerfile.onbuild b/node-vips/Dockerfile.onbuild
index c3b18e5..da848a5 100644
--- a/node-vips/Dockerfile.onbuild
+++ b/node-vips/Dockerfile.onbuild
@@ -1,26 +1,22 @@
-FROM makeomatic/node:6.7.0-vips
+FROM makeomatic/node:6.9.1-vips
 
 ONBUILD WORKDIR /src
 
 ONBUILD COPY package.json .
 ONBUILD RUN \
-  apk add libvips-dev --no-cache --update --repository http://cdn.matic.ninja/apk/community \
-  && apk add --no-cache --update \
+  apk add --no-cache --virtual .flavorDeps \
     git \
     g++ \
     make \
+    vips-dev@testing \
   && npm install --production \
   && npm dedupe \
-  && apk del \
-    g++ \
-    make \
-    libvips-dev \
-    git \
+  && apk del .flavorDeps \
   && rm -rf \
     /tmp/* \
     /root/.node-gyp \
     /root/.npm
 
 ONBUILD COPY . /src
-ONBUILD RUN  chown -R node /src
+ONBUILD RUN chown -R node /src
 ONBUILD USER node
diff --git a/node-vips/Dockerfile.tester-glibc b/node-vips/Dockerfile.tester-glibc
index b84ac12..05651d9 100644
--- a/node-vips/Dockerfile.tester-glibc
+++ b/node-vips/Dockerfile.tester-glibc
@@ -1,10 +1,11 @@
-FROM makeomatic/node:6.7.0-vips
+FROM makeomatic/node:6.9.1-vips
 
 ENV GLIBC_VER 2.23-r3
 
 # to build native deps
 RUN \
-  apk --no-cache add \
+  apk add --update \
+    vips-dev@testing \
     build-base \
     python \
     make \
@@ -13,10 +14,12 @@ RUN \
     make \
     g++ \
     linux-headers \
-  && apk add --no-cache libvips-dev --repository http://cdn.matic.ninja/apk/community \
   && printf '-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApZ2u1KJKUu/fW4A25y9m\ny70AGEa/J3Wi5ibNVGNn1gT1r0VfgeWd0pUybS4UmcHdiNzxJPgoWQhV2SSW1JYu\ntOqKZF5QSN6X937PTUpNBjUvLtTQ1ve1fp39uf/lEXPpFpOPL88LKnDBgbh7wkCp\nm2KzLVGChf83MS0ShL6G9EQIAUxLm99VpgRjwqTQ/KfzGtpke1wqws4au0Ab4qPY\nKXvMLSPLUp7cfulWvhmZSegr5AdhNw5KNizPqCJT8ZrGvgHypXyiFvvAH5YRtSsc\nZvo9GI2e2MaZyo9/lvb+LbLEJZKEQckqRj4P26gmASrZEPStwc+yqy1ShHLA0j6m\n1QIDAQAB\n-----END PUBLIC KEY-----\n' > /etc/apk/keys/sgerrand.rsa.pub \
   && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-${GLIBC_VER}.apk \
   && apk add glibc-${GLIBC_VER}.apk \
-  && rm glibc-${GLIBC_VER}.apk
+  && rm -rf \
+    glibc-${GLIBC_VER}.apk \
+    /etc/apk/cache/* \
+    /var/cache/apk/*
 
 WORKDIR /src
diff --git a/node/Dockerfile b/node/Dockerfile
index 7fbb069..2ac145a 100644
--- a/node/Dockerfile
+++ b/node/Dockerfile
@@ -1,14 +1,14 @@
-FROM alpine:3.4
+FROM alpine:edge
 
 LABEL vendor=makeomatic \
-      version_tags="[\"6\",\"6.7.0\"]"
+      version_tags="[\"6\",\"6.9.1\"]"
 
-ENV NODE_VERSION=v6.7.0 \
+ENV NODE_VERSION=v6.9.1 \
     NPM_VERSION=3 \
     NODE_HOME=/usr/local
 
 RUN \
-  apk add --no-cache --update --virtual .node-buildDeps \
+  apk add --no-cache --virtual .node-buildDeps \
     git \
     curl \
     make \
diff --git a/node/Dockerfile.onbuild b/node/Dockerfile.onbuild
index 35969e8..646f75f 100644
--- a/node/Dockerfile.onbuild
+++ b/node/Dockerfile.onbuild
@@ -1,4 +1,4 @@
-FROM makeomatic/node:6.7.0
+FROM makeomatic/node:6.9.1
 
 ONBUILD WORKDIR /src
 ONBUILD COPY package.json .
diff --git a/node/Dockerfile.tester b/node/Dockerfile.tester
index 9b695dd..cd0f705 100644
--- a/node/Dockerfile.tester
+++ b/node/Dockerfile.tester
@@ -1,4 +1,4 @@
-FROM makeomatic/node:6.7.0
+FROM makeomatic/node:6.9.1
 
 # to build native deps
 RUN \
diff --git a/node/Dockerfile.tester-glibc b/node/Dockerfile.tester-glibc
index 21d9bca..5090dc2 100644
--- a/node/Dockerfile.tester-glibc
+++ b/node/Dockerfile.tester-glibc
@@ -1,4 +1,4 @@
-FROM makeomatic/node:6.7.0
+FROM makeomatic/node:6.9.1
 
 ENV GLIBC_VER 2.23-r3