diff --git a/php5.6/Dockerfile b/php5.6/Dockerfile
deleted file mode 100644
index 6a13957..0000000
--- a/php5.6/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM debian:jessie
-
-# install the PHP extensions we need
-# see https://friendi.ca/resources/requirements/
-RUN set -ex; \
-        apt-get update; \
-        apt-get install -y php5-gd git curl \
-        php5-cli php5-curl php5-mcrypt php5-mysql wget make \
-        php5-redis php5-memcached php5-memcache php5-json php5-mcrypt \
-        ; \
-        rm -rf /var/lib/apt/lists/*;
-
-RUN php5enmod curl pdo pdo_mysql gd opcache json mcrypt
-RUN curl -O -L https://phar.phpunit.de/phpunit-5.5.4.phar; \
-    chmod +x phpunit-5.5.4.phar; \
-    mv phpunit-5.5.4.phar /usr/local/bin/phpunit;
\ No newline at end of file
diff --git a/php7.1/Dockerfile b/php7.1/Dockerfile
new file mode 100644
index 0000000..690feef
--- /dev/null
+++ b/php7.1/Dockerfile
@@ -0,0 +1,20 @@
+FROM debian:jessie
+
+# install the PHP extensions we need
+# see https://friendi.ca/resources/requirements/
+RUN set -ex; \
+        apt-get update; \
+        apt-get install -y wget gnupg2 libzip2 apt-transport-https lsb-release ca-certificates; \
+        wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg; \
+        echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list; \
+        apt-get update; \
+        apt-get install -y php7.1-gd git curl \
+        php7.1-cli php7.1-curl php7.1-mcrypt php7.1-mysql wget make \
+        php7.1-redis php7.1-memcached php7.1-memcache php7.1-json php7.1-mcrypt \
+        php7.1-apcu php7.1-xdebug php7.1-xml php7.1-zip php7.1-dev php7.1-mbstring \
+        ; \
+        rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*;
+
+RUN phpenmod curl pdo pdo_mysql xml gd zip opcache mbstring posix ctype json iconv pcntl
+RUN phpdismod xdebug
+ADD php.ini /etc/php/7.1/cli/conf.d/friendica.ini
\ No newline at end of file
diff --git a/php7.1/php.ini b/php7.1/php.ini
new file mode 100644
index 0000000..97888e9
--- /dev/null
+++ b/php7.1/php.ini
@@ -0,0 +1,10 @@
+memory_limit = 768M
+phar.readonly = 0 ; only for building phar files on CI - should be disabled on production environments
+; Opcache
+opcache.enable=1
+opcache.enable_cli=1
+opcache.interned_strings_buffer=8
+opcache.max_accelerated_files=10000
+opcache.memory_consumption=128
+opcache.save_comments=1
+opcache.revalidate_freq=1
\ No newline at end of file