diff --git a/.drone.yml b/.drone.yml
index ec44452910..f697c836eb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -52,7 +52,7 @@ steps:
   commands:
     - git submodule update --init
 - name: checkers
-  image: nextcloudci/php7.1:php7.1-16
+  image: nextcloudci/php7.2:php7.2-12
   commands:
     - ./autotest-checkers.sh
   secrets: [ github_token ]
@@ -93,11 +93,6 @@ steps:
   image: docker:git
   commands:
     - git submodule update --init
-- name: syntax-php7.1
-  image: nextcloudci/php7.1:php7.1-16
-  commands:
-    - composer install
-    - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
 - name: syntax-php7.2
   image: nextcloudci/php7.2:php7.2-12
   commands:
@@ -134,7 +129,7 @@ steps:
   commands:
     - git submodule update --init
 - name: litmus-v1
-  image: nextcloudci/litmus-php7.1:1
+  image: nextcloudci/litmus-php7.2:1
   commands:
     - bash tests/travis/install.sh sqlite
     - bash apps/dav/tests/travis/litmus-v1/script.sh
@@ -162,7 +157,7 @@ steps:
   commands:
     - git submodule update --init
 - name: caldavtester-new-endpoint
-  image: nextcloudci/litmus-php7.1:1
+  image: nextcloudci/litmus-php7.2:1
   commands:
     - bash tests/travis/install.sh sqlite
     - bash apps/dav/tests/travis/caldav/install.sh
@@ -186,7 +181,7 @@ steps:
   commands:
     - git submodule update --init
 - name: caldavtester-old-endpoint
-  image: nextcloudci/litmus-php7.1:1
+  image: nextcloudci/litmus-php7.2:1
   commands:
     - bash tests/travis/install.sh sqlite
     - bash apps/dav/tests/travis/caldav/install.sh
@@ -210,7 +205,7 @@ steps:
   commands:
     - git submodule update --init
 - name: carddavtester-new-endpoint
-  image: nextcloudci/litmus-php7.1:1
+  image: nextcloudci/litmus-php7.2:1
   commands:
     - bash tests/travis/install.sh sqlite
     - bash apps/dav/tests/travis/carddav/install.sh
@@ -234,7 +229,7 @@ steps:
   commands:
     - git submodule update --init
 - name: carddavtester-old-endpoint
-  image: nextcloudci/litmus-php7.1:1
+  image: nextcloudci/litmus-php7.2:1
   commands:
     - bash tests/travis/install.sh sqlite
     - bash apps/dav/tests/travis/carddav/install.sh
@@ -327,10 +322,6 @@ steps:
   image: docker:git
   commands:
     - git submodule update --init
-- name: nodb-php7.1
-  image: nextcloudci/php7.1:php7.1-16
-  commands:
-    - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
 - name: nodb-php7.2
   image: nextcloudci/php7.2:php7.2-11
   commands:
@@ -361,10 +352,6 @@ steps:
   image: docker:git
   commands:
     - git submodule update --init
-- name: sqlite-php7.1
-  image: nextcloudci/php7.1:php7.1-16
-  commands:
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
 - name: sqlite-php7.2
   image: nextcloudci/php7.2:php7.2-12
   commands:
@@ -388,15 +375,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.1-php7.1
+name: mariadb10.1-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mariadb10.1-php7.1
-  image: nextcloudci/php7.1:php7.1-16
+- name: mariadb10.1-php7.2
+  image: nextcloudci/php7.2:php7.2-12
   commands:
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
 
@@ -423,15 +410,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.2-php7.1
+name: mariadb10.2-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mariadb10.2-php7.1
-  image: nextcloudci/php7.1:php7.1-16
+- name: mariadb10.2-php7.2
+  image: nextcloudci/php7.2:php7.2-12
   commands:
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
 
@@ -457,15 +444,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.3-php7.1
+name: mariadb10.3-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mariadb10.3-php7.1
-  image: nextcloudci/php7.1:php7.1-16
+- name: mariadb10.3-php7.2
+  image: nextcloudci/php7.2:php7.2-12
   commands:
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
 
@@ -560,40 +547,6 @@ trigger:
     - pull_request
     - push
 
----
-kind: pipeline
-name: mysql5.7-php7.1
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: mysql-php7.1
-  image: nextcloudci/php7.1:php7.1-16
-  commands:
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
-
-services:
-- name: cache
-  image: redis
-- name: mysql
-  image: mysql:5.7
-  environment:
-    MYSQL_ROOT_PASSWORD: owncloud
-    MYSQL_USER: oc_autotest
-    MYSQL_PASSWORD: owncloud
-    MYSQL_DATABASE: oc_autotest
-  tmpfs:
-    - /var/lib/mysql
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - push
-
 ---
 kind: pipeline
 name: mysql5.7-php7.2
@@ -660,15 +613,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mysql5.6-php7.1
+name: mysql5.6-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mysql5.6-php7.1
-  image: nextcloudci/php7.1:php7.1-16
+- name: mysql5.6-php7.2
+  image: nextcloudci/php7.2:php7.2-12
   commands:
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
 
@@ -729,15 +682,15 @@ trigger:
 
 ---
 kind: pipeline
-name: postgres10-php7.1
+name: postgres10-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: postgres-php7.1
-  image: nextcloudci/php7.1:php7.1-16
+- name: postgres-php7.2
+  image: nextcloudci/php7.2:php7.2-12
   commands:
     - sleep 10 # gives the database enough time to initialize
     - POSTGRES=10 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
@@ -763,15 +716,15 @@ trigger:
 
 ---
 kind: pipeline
-name: postgres11-php7.1
+name: postgres11-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: postgres-php7.1
-  image: nextcloudci/php7.1:php7.1-16
+- name: postgres-php7.2
+  image: nextcloudci/php7.2:php7.2-12
   commands:
     - sleep 10 # gives the database enough time to initialize
     - POSTGRES=11 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
@@ -796,41 +749,6 @@ trigger:
     - pull_request
     - push
 
----
-kind: pipeline
-name: mysqlmb4-php7.1
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: mysqlmb4-php7.1
-  image: nextcloudci/php7.1:php7.1-16
-  commands:
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
-
-services:
-- name: cache
-  image: redis
-- name: mysqlmb4
-  image: mysql:5.7.22
-  environment:
-    MYSQL_ROOT_PASSWORD: owncloud
-    MYSQL_USER: oc_autotest
-    MYSQL_PASSWORD: owncloud
-    MYSQL_DATABASE: oc_autotest
-  command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
-  tmpfs:
-    - /var/lib/mysql
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - push
-
 ---
 kind: pipeline
 name: mysqlmb4-php7.2
@@ -2123,7 +2041,7 @@ steps:
   commands:
     - git submodule update --init
 - name: nodb-codecov
-  image: nextcloudci/php7.1:php7.1-16
+  image: nextcloudci/php7.2:php7.2-12
   commands:
     - phpenmod xdebug
     - TEST_SELECTION=NODB ./autotest.sh sqlite
@@ -2152,7 +2070,7 @@ steps:
   commands:
     - git submodule update --init
 - name: db-codecov
-  image: nextcloudci/php7.1:php7.1-16
+  image: nextcloudci/php7.2:php7.2-12
   commands:
     - phpenmod xdebug
     - TEST_SELECTION=QUICKDB ./autotest.sh sqlite
@@ -2181,7 +2099,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: nextcloudci/php7.1:php7.1-16
+  image: nextcloudci/php7.2:php7.2-12
   commands:
     - phpenmod xdebug
     - ./tests/drone-wait-objectstore.sh
@@ -2212,7 +2130,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: nextcloudci/php7.1:php7.1-16
+  image: nextcloudci/php7.2:php7.2-12
   commands:
     - phpenmod xdebug
     - ./tests/drone-wait-objectstore.sh
@@ -2334,34 +2252,34 @@ trigger:
     - pull_request
     - push
 
----
-kind: pipeline
-name: memcache-redis-cluster
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: memcache-redis-cluster
-  image: nextcloudci/php7.1:php7.1-16
-  commands:
-    - phpenmod xdebug
-    - sleep 20
-    - ./autotest.sh sqlite tests/lib/Memcache/RedisTest.php
-    - wget https://codecov.io/bash -O codecov.sh
-    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
-    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
-
-services:
-- name: cache-cluster
-  image: morrisjobke/redis-cluster
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
+#---
+#kind: pipeline
+#name: memcache-redis-cluster
+#
+#steps:
+#- name: submodules
+#  image: docker:git
+#  commands:
+#    - git submodule update --init
+#- name: memcache-redis-cluster
+#  image: nextcloudci/php7.2:php7.2-12
+#  commands:
+#    - phpenmod xdebug
+#    - sleep 20
+#    - ENABLE_REDIS_CLUSTER=true ./autotest.sh sqlite tests/lib/Memcache/RedisTest.php
+#    - wget https://codecov.io/bash -O codecov.sh
+#    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
+#    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
+#
+#services:
+#- name: cache-cluster
+#  image: morrisjobke/redis-cluster
+#
+#trigger:
+#  branch:
+#    - master
+#    - stable*
+#  event:
+#    - pull_request
+#    - push