diff --git a/lychee/Dockerfile b/lychee/Dockerfile
index 56240c7..2b23f20 100644
--- a/lychee/Dockerfile
+++ b/lychee/Dockerfile
@@ -1,11 +1,10 @@
 FROM alpine:edge
 
 ARG LYCHEE_VERSION=3.1.5
-ARG IMAGICK_EXT_VERSION=3.4.2
 
 ENV UID=991 GID=991
 
-RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && BUILD_DEPS=" \
     imagemagick-dev \
     tar \
@@ -13,39 +12,38 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
     ca-certificates \
     build-base \
     autoconf \
+    pcre-dev \
     libtool" \
- && apk -U add \
+ && apk -U upgrade && apk add \
     ${BUILD_DEPS} \
     nginx \
-    php7-mbstring@commuedge \
-    php7-fpm@commuedge \
-    php7-exif@commuedge \
-    php7-gd@commuedge \
-    php7-json@commuedge \
-    php7-mysqli@commuedge \
-    php7-zip@commuedge \
-    php7-session@commuedge \
-    php7-pear@commuedge \
-    php7-dev@commuedge \
+    php7.1-mbstring@testing \
+    php7.1-fpm@testing \
+    php7.1-exif@testing \
+    php7.1-gd@testing \
+    php7.1-json@testing \
+    php7.1-mysqli@testing \
+    php7.1-zip@testing \
+    php7.1-session@testing \
+    php7.1-pear@testing \
+    php7.1-dev@testing \
     s6 \
     su-exec \
     imagemagick \
+ && pecl install imagick \
+ && echo "extension=imagick.so" > /etc/php7.1/conf.d/imagick.ini \
  && sed -i -e "s/max_execution_time = 30/max_execution_time = 200/g" \
     -e "s/post_max_size = 8M/post_max_size = 100M/g" \
     -e "s/upload_max_filesize = 2M/upload_max_filesize = 20M/g" \
     -e "s/memory_limit = 256M/memory_limit = 512M/g" \
-    /etc/php7/php.ini \
+    /etc/php7.1/php.ini \
  && mkdir /lychee && cd /lychee \
  && wget -qO- https://github.com/electerious/Lychee/archive/v${LYCHEE_VERSION}.tar.gz | tar xz --strip 1 \
- && cd /tmp && wget -q https://pecl.php.net/get/imagick-${IMAGICK_EXT_VERSION}.tgz \
- && tar xzf imagick-${IMAGICK_EXT_VERSION}.tgz && cd imagick-${IMAGICK_EXT_VERSION} \
- && phpize7 && ./configure --with-php-config=/usr/bin/php-config7 && make && make install \
- && echo "extension=imagick.so" > /etc/php7/conf.d/00_imagick.ini \
- && apk del ${BUILD_DEPS} php7-pear php7-dev \
+ && apk del ${BUILD_DEPS} php7.1-pear php7.1-dev \
  && rm -rf /var/cache/apk/* /tmp/*
 
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY php-fpm.conf /etc/php7/php-fpm.conf
+COPY php-fpm.conf /etc/php7.1/php-fpm.conf
 COPY s6.d /etc/s6.d
 COPY run.sh /usr/local/bin/run.sh
 
diff --git a/lychee/run.sh b/lychee/run.sh
index 040ae9a..790cd99 100644
--- a/lychee/run.sh
+++ b/lychee/run.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 mkdir /lychee/uploads/big /lychee/uploads/import /lychee/uploads/medium /lychee/uploads/thumb
-chown -R $UID:$GID /lychee /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d
+chown -R $UID:$GID /lychee /etc/nginx /etc/php7.1 /var/log /var/lib/nginx /tmp /etc/s6.d
 exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d
diff --git a/lychee/s6.d/php/run b/lychee/s6.d/php/run
index e238021..e0b458a 100644
--- a/lychee/s6.d/php/run
+++ b/lychee/s6.d/php/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec php-fpm7
+exec php-fpm7.1
diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index 952ff1a..16afac7 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -2,18 +2,18 @@ FROM alpine:edge
 
 ENV GID=991 UID=991
 
-RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && BUILD_DEPS="tar libressl ca-certificates" \
- && apk -U add \
+ && apk -U upgrade && apk add \
     $BUILD_DEPS \
     nginx \
     s6 \
     su-exec \
-    php7-fpm@commuedge \
-    php7-gd@commuedge \
-    php7-mcrypt@commuedge \
-    php7-json@commuedge \
-    php7-zlib@commuedge \
+    php7.1-fpm@testing \
+    php7.1-gd@testing \
+    php7.1-mcrypt@testing \
+    php7.1-json@testing \
+    php7.1-zlib@testing \
  && mkdir zerobin && cd zerobin \
  && wget -qO- https://github.com/PrivateBin/PrivateBin/archive/master.tar.gz | tar xz --strip 1 \
  && mv cfg/conf.ini.sample cfg/conf.ini \
@@ -21,7 +21,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
  && rm -f /var/cache/apk/*
 
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY php-fpm.conf /etc/php7/php-fpm.conf
+COPY php-fpm.conf /etc/php7.1/php-fpm.conf
 COPY run.sh /usr/local/bin/run.sh
 COPY s6.d /etc/s6.d
 
diff --git a/privatebin/run.sh b/privatebin/run.sh
index 3fa0485..70493f3 100644
--- a/privatebin/run.sh
+++ b/privatebin/run.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-chown -R $UID:$GID /zerobin /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d
+chown -R $UID:$GID /zerobin /etc/nginx /etc/php7.1 /var/log /var/lib/nginx /tmp /etc/s6.d
 exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d
diff --git a/privatebin/s6.d/php/run b/privatebin/s6.d/php/run
index e238021..e0b458a 100644
--- a/privatebin/s6.d/php/run
+++ b/privatebin/s6.d/php/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec php-fpm7
+exec php-fpm7.1