diff --git a/ftp-php7.0/Dockerfile b/ftp-php7.0/Dockerfile
deleted file mode 100644
index 64e6a91f..00000000
--- a/ftp-php7.0/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Based upon https://github.com/MorrisJobke/docker-proftpd
-From nextcloudci/php7.0:php7.0-16
-
-RUN apt-get update
-RUN apt-get -y install debconf-utils
-RUN echo "poftpd-basic shared/proftpd/inetd_or_standalone select standalone" | debconf-set-selections
-
-RUN apt-get install -y proftpd
-
-ADD launch /launch
-ADD proftpd.conf /etc/proftpd/proftpd.conf
-RUN chown root:root /etc/proftpd/proftpd.conf
-RUN mkdir /ftp
-RUN chmod a+x /launch
\ No newline at end of file
diff --git a/ftp-php7.0/launch b/ftp-php7.0/launch
deleted file mode 100644
index ae085054..00000000
--- a/ftp-php7.0/launch
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash -e
-
-USERNAME=test
-PASSWORD=12345
-
-echo Setting credentials to $USERNAME:$PASSWORD
-PASSWORD=$(perl -e 'print crypt($ARGV[0], "password")' $PASSWORD)
-useradd --shell /bin/sh --create-home --password $PASSWORD $USERNAME
-chown -R $USERNAME:$USERNAME /ftp
-exec proftpd --nodaemon
\ No newline at end of file
diff --git a/ftp-php7.0/proftpd.conf b/ftp-php7.0/proftpd.conf
deleted file mode 100644
index 25511fb9..00000000
--- a/ftp-php7.0/proftpd.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-ServerName "proftpd"
-DefaultRoot /ftp
-User root
-
-<Anonymous ~ftp>
-RequireValidShell off
-MaxClients 10
-<Directory *>
-<Limit WRITE>
-DenyAll
-</Limit>
-</Directory>
-</Anonymous>
\ No newline at end of file
diff --git a/integration-php7.0/Dockerfile b/integration-php7.0/Dockerfile
deleted file mode 100644
index 299595da..00000000
--- a/integration-php7.0/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM nextcloudci/php7.0:php7.0-19
-RUN mkdir /tmp/server && \
-    cd /tmp/server && git clone --recursive https://github.com/nextcloud/server.git && \
-    cd /tmp/server/server/build/integration && composer install && \
-    cd /tmp/server/server/tests/acceptance && composer install && \
-    rm -rf /tmp/server
diff --git a/litmus-php7.0/Dockerfile b/litmus-php7.0/Dockerfile
deleted file mode 100644
index 21017023..00000000
--- a/litmus-php7.0/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM nextcloudci/php7.0:php7.0-16
-RUN apt-get update && apt-get install -y gcc realpath make python && \
-    mkdir -p /tmp/litmus && \
-    wget -O /tmp/litmus/litmus-0.13.tar.gz http://www.webdav.org/neon/litmus/litmus-0.13.tar.gz && \
-    cd /tmp/litmus && tar -xzf litmus-0.13.tar.gz && \
-    cd /tmp/litmus/litmus-0.13 && ./configure && make && rm -f /tmp/litmus-0.13.tar.gz && \
-    apt-get clean
diff --git a/mysql-5.7/Dockerfile b/mysql-5.7/Dockerfile
deleted file mode 100644
index cdef44d4..00000000
--- a/mysql-5.7/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-FROM mysql:5.7.22
diff --git a/php5.4/Dockerfile b/php5.4/Dockerfile
deleted file mode 100644
index d1744f2f..00000000
--- a/php5.4/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM debian:oldstable
-RUN apt-get update && apt-get install -y php5-intl php5-gd git curl \
-    php5-cli php5-curl php5-imagick php5-mcrypt php5-ldap php5-sqlite \
-    make libmagickcore5-extra && \
-    apt-get autoremove -y && apt-get autoclean && apt-get clean && \
-    rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
-RUN php5enmod zip intl gd
-RUN curl -O -L https://phar.phpunit.de/phpunit-4.8.24.phar \
-    && chmod +x phpunit-4.8.24.phar \
-    && mv phpunit-4.8.24.phar /usr/local/bin/phpunit
-RUN curl -O -L https://getcomposer.org/download/1.1.2/composer.phar \
-    && chmod +x composer.phar \
-    && mv composer.phar /usr/local/bin/composer
-
-ADD nextcloud.ini /etc/php5/cli/conf.d/nextcloud.ini
diff --git a/php5.4/nextcloud.ini b/php5.4/nextcloud.ini
deleted file mode 100644
index 8f184ffb..00000000
--- a/php5.4/nextcloud.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-memory_limit = 768M
-phar.readonly = 0 ; only for building phar files on CI - should be disabled on production environments
diff --git a/php5.5/Dockerfile b/php5.5/Dockerfile
deleted file mode 100644
index f804903d..00000000
--- a/php5.5/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM debian:oldstable
-RUN apt-get update && apt-get install -y wget && \
-    wget http://www.dotdeb.org/dotdeb.gpg && \
-    apt-key add dotdeb.gpg && \
-    echo "deb http://packages.dotdeb.org wheezy-php55 all" >> /etc/apt/sources.list && \
-    echo "deb-src http://packages.dotdeb.org wheezy-php55 all" >> /etc/apt/sources.list && \
-    apt-get update && apt-get install -y php5-intl php5-gd git curl \
-    php5-cli php5-curl php5-imagick php5-mcrypt php5-ldap \
-    php5-apcu php5-redis php5-sqlite make libmagickcore5-extra && \
-    apt-get autoremove -y && apt-get autoclean && apt-get clean && \
-    rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
-RUN php5enmod zip intl gd
-RUN curl -O -L https://phar.phpunit.de/phpunit-4.8.24.phar \
-    && chmod +x phpunit-4.8.24.phar \
-    && mv phpunit-4.8.24.phar /usr/local/bin/phpunit
-RUN curl -O -L https://getcomposer.org/download/1.1.2/composer.phar \
-    && chmod +x composer.phar \
-    && mv composer.phar /usr/local/bin/composer
-
-ADD nextcloud.ini /etc/php5/cli/conf.d/nextcloud.ini
diff --git a/php5.5/nextcloud.ini b/php5.5/nextcloud.ini
deleted file mode 100644
index 8f184ffb..00000000
--- a/php5.5/nextcloud.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-memory_limit = 768M
-phar.readonly = 0 ; only for building phar files on CI - should be disabled on production environments
diff --git a/php5.6/Dockerfile b/php5.6/Dockerfile
deleted file mode 100644
index cb78c476..00000000
--- a/php5.6/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM debian:jessie
-RUN apt-get update && apt-get install -y php5-intl php5-gd git curl \
-    php5-cli php5-curl php5-imagick php5-pgsql php5-mcrypt php5-ldap \
-    php5-apcu php5-redis php5-sqlite php5-mysql wget make libmagickcore-6.q16-2-extra \
-    && apt-get autoremove -y && apt-get autoclean && apt-get clean && \
-    rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
-RUN php5enmod zip intl gd
-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
-RUN curl -O -L https://getcomposer.org/download/1.1.2/composer.phar \
-    && chmod +x composer.phar \
-    && mv composer.phar /usr/local/bin/composer
-
-ADD nextcloud.ini /etc/php5/cli/conf.d/nextcloud.ini
diff --git a/php5.6/nextcloud.ini b/php5.6/nextcloud.ini
deleted file mode 100644
index 4f183c31..00000000
--- a/php5.6/nextcloud.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-apc.enable_cli = 1
-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
diff --git a/php7.0-memcached/Dockerfile b/php7.0-memcached/Dockerfile
deleted file mode 100644
index 88b171e7..00000000
--- a/php7.0-memcached/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM nextcloudci/php7.0:php7.0-19
-RUN apt-get update && \
-    apt-get purge -y php7.0-apcu && \
-    apt-get install -y php7.0-memcached memcached && \
-    update-rc.d memcached enable && \
-    apt-get autoremove -y && apt-get autoclean && apt-get clean && \
-    rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
-
-ADD nextcloud.ini /etc/php/7.0/cli/conf.d/nextcloud.ini
-ENTRYPOINT service memcached restart && bash
diff --git a/php7.0-memcached/nextcloud.ini b/php7.0-memcached/nextcloud.ini
deleted file mode 100644
index 0b34408e..00000000
--- a/php7.0-memcached/nextcloud.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-#apc.enable_cli = 1
-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
diff --git a/php7.0/Dockerfile b/php7.0/Dockerfile
deleted file mode 100644
index effbfe16..00000000
--- a/php7.0/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM debian:jessie
-RUN apt-get update && apt-get install -y wget gnupg2 libzip2 && \
-    wget http://www.dotdeb.org/dotdeb.gpg && \
-    apt-key add dotdeb.gpg && \
-    echo "deb http://packages.dotdeb.org jessie all" >> /etc/apt/sources.list && \
-    echo "deb-src http://packages.dotdeb.org jessie all" >> /etc/apt/sources.list && \
-    apt-get update && apt-get install -y php7.0-intl php7.0-gd git curl \
-    php7.0-cli php7.0-curl php7.0-imagick php7.0-pgsql php7.0-mcrypt php7.0-ldap \
-    php7.0-apcu php7.0-redis php7.0-sqlite php7.0-mysql php7.0-zip php7.0-xml \
-    php7.0-mbstring php7.0-xdebug php7.0-dev make libmagickcore-6.q16-2-extra unzip && \
-    apt-get autoremove -y && apt-get autoclean && apt-get clean && \
-    rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
-
-RUN cd /tmp/ && \
-    git clone https://github.com/phpredis/phpredis.git && \
-    cd phpredis && \
-    git checkout 3.1.3 && \
-    phpize && \
-    ./configure && \
-    make && \
-    make install && \
-    cd / && \
-    rm -rf /tmp/phpredis
-
-RUN cd /tmp/ && wget https://github.com/nikic/php-ast/archive/master.zip && unzip master.zip
-RUN cd /tmp/php-ast-master/ && phpize && ./configure && make && make install && rm -rf /tmp/php-ast-master/
-RUN echo "extension=ast.so" >> /etc/php/7.0/cli/conf.d/20-ast.ini
-RUN phpenmod zip intl gd
-RUN curl -O -L https://phar.phpunit.de/phpunit-6.5.5.phar \
-    && chmod +x phpunit-6.5.5.phar \
-    && mv phpunit-6.5.5.phar /usr/local/bin/phpunit
-RUN curl -O -L https://getcomposer.org/download/1.6.2/composer.phar \
-    && chmod +x composer.phar \
-    && mv composer.phar /usr/local/bin/composer
-
-RUN phpdismod xdebug
-ADD nextcloud.ini /etc/php/7.0/cli/conf.d/nextcloud.ini
diff --git a/php7.0/nextcloud.ini b/php7.0/nextcloud.ini
deleted file mode 100644
index 1040480b..00000000
--- a/php7.0/nextcloud.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-apc.enable_cli = 1
-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
diff --git a/samba-native-php7.0/Dockerfile b/samba-native-php7.0/Dockerfile
deleted file mode 100644
index 467c00e0..00000000
--- a/samba-native-php7.0/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM nextcloudci/samba-non-native-php7.0:samba-non-native-php7.0-4
-
-RUN apt update
-RUN apt-get install -y php7.0-dev libsmbclient-dev git
-RUN git clone git://github.com/eduardok/libsmbclient-php.git
-RUN cd libsmbclient-php && phpize && ./configure && make && make install
-
-ADD smbclient.ini /etc/php/7.0/cli/conf.d/smbclient.ini
diff --git a/samba-native-php7.0/smbclient.ini b/samba-native-php7.0/smbclient.ini
deleted file mode 100644
index 03f920fe..00000000
--- a/samba-native-php7.0/smbclient.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension="smbclient.so"
diff --git a/samba-non-native-php7.0/Dockerfile b/samba-non-native-php7.0/Dockerfile
deleted file mode 100644
index 62f38456..00000000
--- a/samba-non-native-php7.0/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Based upon https://hub.docker.com/r/silvershell/samba/
-FROM nextcloudci/php7.0:php7.0-16
-
-ENV SMB_USER smbuser
-ENV SMB_PASSWORD smbpassword
-
-RUN apt-get update
-
-RUN apt-get install -y samba smbclient
-RUN mkdir -p /opt/samba/share
-RUN chmod 777 /opt/samba/share
-
-RUN mkdir -p /opt/samba/user
-RUN chmod 777 /opt/samba/user
-
-RUN useradd -s /bin/false "$SMB_USER"
-RUN (echo "$SMB_PASSWORD"; echo "$SMB_PASSWORD" ) | pdbedit -a -u "$SMB_USER"
-
-EXPOSE 137/udp 138/udp 139 445
-
-COPY smb.conf /etc/samba/smb.conf
-
diff --git a/samba-non-native-php7.0/smb.conf b/samba-non-native-php7.0/smb.conf
deleted file mode 100644
index 6ba32a5c..00000000
--- a/samba-non-native-php7.0/smb.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-[global]
-    security = user
-    
-    load printers = no
-    printcap name = /dev/null
-    printing = bsd
-    
-    unix charset = UTF-8
-    dos charset = CP932
-    
-    workgroup = WORKGROUP
-    
-    server string = %h server (Samba, Ubuntu)
-    dns proxy = no
-    interfaces = eth* lo
-    bind interfaces only = no
-    log file = /var/log/samba/log.%m
-    max log size = 1000
-    syslog = 0
-    panic action = /usr/share/samba/panic-action %d
-    server role = standalone server
-    passdb backend = tdbsam
-    obey pam restrictions = yes
-    unix password sync = yes
-    passwd program = /usr/bin/passwd %u
-    passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .
-    pam password change = yes
-    map to guest = Bad User
-    usershare allow guests = yes
-
-[public]
-    path = /opt/samba/share
-    writable = yes
-    printable = no
-    public = yes
-    guest only = yes
-    create mode = 0777
-    directory mode = 0777
-
-[user]
-    path = /opt/samba/user
-    writable = yes
-    printable = no
-    public = no
-    create mode = 0777
-    directory mode = 0777
diff --git a/webdav-apache-php7.0/Dockerfile b/webdav-apache-php7.0/Dockerfile
deleted file mode 100644
index 06f8a4df..00000000
--- a/webdav-apache-php7.0/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM nextcloudci/php7.0:php7.0-7
-
-RUN apt-get update
-RUN apt-get install -y apache2 apache2-utils
-RUN a2enmod dav dav_fs
-RUN a2dissite 000-default
-
-ENV APACHE_RUN_USER www-data
-ENV APACHE_RUN_GROUP www-data
-ENV APACHE_LOG_DIR /var/log/apache2
-ENV APACHE_PID_FILE /var/run/apache2.pid
-ENV APACHE_LOCK_DIR /var/lock/apache2
-ENV APACHE_RUN_DIR /var/run/apache2
-
-RUN mkdir -p /var/lock/apache2; chown www-data /var/lock/apache2
-RUN mkdir -p /var/webdav; chown www-data /var/webdav
-
-ADD webdav.conf /etc/apache2/sites-available/webdav.conf
-RUN a2ensite webdav
-
-RUN htpasswd -cb /etc/apache2/webdav.password test pass
-RUN chown root:www-data /etc/apache2/webdav.password
-RUN chmod 640 /etc/apache2/webdav.password
-
-RUN apt-get autoremove -y && \
-    apt-get autoclean && \
-    apt-get clean && \
-    rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
-
diff --git a/webdav-apache-php7.0/webdav.conf b/webdav-apache-php7.0/webdav.conf
deleted file mode 100644
index 05929f3c..00000000
--- a/webdav-apache-php7.0/webdav.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-Alias /webdav /var/webdav/
-<Location /webdav/>
-    DAV on
-    Options +Indexes
-    AuthType Basic
-    AuthName "webdav"
-    AuthUserFile /etc/apache2/webdav.password
-    Require valid-user
-</Location>
-
-<Directory /var/webdav/>
-    Options Indexes FollowSymLinks
-    AllowOverride None
-    Require all granted
-</Directory>
diff --git a/webdav-apache-php7.1/Dockerfile b/webdav-apache-php7.1/Dockerfile
deleted file mode 100644
index 7473673a..00000000
--- a/webdav-apache-php7.1/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM nextcloudci/php7.1:php7.1-16
-
-RUN apt-get update
-RUN apt-get install -y apache2 apache2-utils
-RUN a2enmod dav dav_fs
-RUN a2dissite 000-default
-
-ENV APACHE_RUN_USER www-data
-ENV APACHE_RUN_GROUP www-data
-ENV APACHE_LOG_DIR /var/log/apache2
-ENV APACHE_PID_FILE /var/run/apache2.pid
-ENV APACHE_LOCK_DIR /var/lock/apache2
-ENV APACHE_RUN_DIR /var/run/apache2
-
-RUN mkdir -p /var/lock/apache2; chown www-data /var/lock/apache2
-RUN mkdir -p /var/webdav; chown www-data /var/webdav
-
-ADD webdav.conf /etc/apache2/sites-available/webdav.conf
-RUN a2ensite webdav
-
-RUN htpasswd -cb /etc/apache2/webdav.password test pass
-RUN chown root:www-data /etc/apache2/webdav.password
-RUN chmod 640 /etc/apache2/webdav.password
-
-RUN apt-get autoremove -y && \
-    apt-get autoclean && \
-    apt-get clean && \
-    rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
-