diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
index 46fb0d29..832a9b58 100644
--- a/.circleci/Dockerfile
+++ b/.circleci/Dockerfile
@@ -9,14 +9,16 @@ RUN apt-get -qq update \
 RUN curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer | bash -
 
 RUN \
-  for VIPS_VERSION in "8.3" "8.4" "8.5" "8.6" "8.7"; do \
-    mkdir -p /root/vips \
-    && cd /root/vips \
-    && mkdir /root/vips/$VIPS_VERSION \
-    && curl -s -S -L -o $VIPS_VERSION.zip https://github.com/libvips/libvips/archive/$VIPS_VERSION.zip \
-    && unzip $VIPS_VERSION.zip \
-    && cd libvips-$VIPS_VERSION \
-    && test -f autogen.sh && ./autogen.sh || ./bootstrap.sh \
+  mkdir /root/vips \
+  && cd /root/vips \
+  && curl -s -S -L -o vips_releases.json "https://api.github.com/repos/libvips/libvips/releases" \
+  && for VIPS_VERSION in "8.6" "8.7" "8.8"; do \
+    mkdir $VIPS_VERSION \
+    && export VIPS_RELEASE=$(grep -m 1 "\"tag_name\": \"v$VIPS_VERSION." vips_releases.json | sed -E 's/.*"v([^"]+)".*/\1/') \
+    && echo "Building Vips $VIPS_RELEASE as $VIPS_VERSION" \
+    && curl -s -S -L -o $VIPS_RELEASE.tar.gz https://github.com/libvips/libvips/releases/download/v$VIPS_RELEASE/vips-$VIPS_RELEASE.tar.gz \
+    && tar -xzf $VIPS_RELEASE.tar.gz \
+    && cd vips-$VIPS_RELEASE \
     && ./configure \
       --prefix=/root/vips/$VIPS_VERSION \
       --without-python \
@@ -29,10 +31,9 @@ RUN \
       --enable-gtk-doc-html=no \
       --enable-gtk-doc=no \
       --enable-pyvips8=no \
-    && make \
     && make install \
     && cd .. \
-    && rm -rf $VIPS_VERSION.zip libvips-$VIPS_VERSION; \
+    && rm -rf $VIPS_RELEASE.tar.gz vips-$VIPS_RELEASE; \
   done
 
 WORKDIR /go/src
diff --git a/.circleci/config.yml b/.circleci/config.yml
index fe740ad5..3d84e837 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,13 @@ workflows:
           requires:
             - checkout_code
           go_version: "1.12"
-          vips_version: "8.7"
+          vips_version: "8.8"
+      - build:
+          name: go1.12_vips8.8
+          requires:
+            - checkout_code
+          go_version: "1.12"
+          vips_version: "8.8"
       - build:
           name: go1.12_vips8.7
           requires:
@@ -23,11 +29,11 @@ workflows:
           go_version: "1.12"
           vips_version: "8.6"
       - build:
-          name: go1.12_vips8.5
+          name: go1.11_vips8.8
           requires:
             - checkout_code
-          go_version: "1.12"
-          vips_version: "8.5"
+          go_version: "1.11"
+          vips_version: "8.8"
       - build:
           name: go1.11_vips8.7
           requires:
@@ -41,11 +47,11 @@ workflows:
           go_version: "1.11"
           vips_version: "8.6"
       - build:
-          name: go1.11_vips8.5
+          name: go1.10_vips8.8
           requires:
             - checkout_code
-          go_version: "1.11"
-          vips_version: "8.5"
+          go_version: "1.10"
+          vips_version: "8.8"
       - build:
           name: go1.10_vips8.7
           requires:
@@ -58,12 +64,6 @@ workflows:
             - checkout_code
           go_version: "1.10"
           vips_version: "8.6"
-      - build:
-          name: go1.10_vips8.5
-          requires:
-            - checkout_code
-          go_version: "1.10"
-          vips_version: "8.5"
 
 executors:
   imgproxy: