diff --git a/.drone.yml b/.drone.yml
index a3bccf029d..fbdbe74a2e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,14 +15,14 @@ pipeline:
       matrix:
         TESTS: jsunit
   checkers:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-16
     commands:
       - ./autotest-checkers.sh
     when:
       matrix:
         TESTS: checkers
   syntax-php5.6:
-    image: nextcloudci/php5.6:php5.6-7
+    image: nextcloudci/php5.6:php5.6-8
     commands:
       - composer install
       - ./lib/composer/bin/parallel-lint --exclude build/.phan/ --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
@@ -30,7 +30,7 @@ pipeline:
       matrix:
         TESTS: syntax-php5.6
   syntax-php7.0:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-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 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
@@ -38,7 +38,7 @@ pipeline:
       matrix:
         TESTS: syntax-php7.0
   syntax-php7.1:
-    image: nextcloudci/php7.1:php7.1-12
+    image: nextcloudci/php7.1:php7.1-15
     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 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
@@ -46,7 +46,7 @@ pipeline:
       matrix:
         TESTS: syntax-php7.1
   phan:
-    image: nextcloudci/php7.1:php7.1-12
+    image: nextcloudci/php7.1:php7.1-15
     commands:
       - rm /etc/php/7.1/cli/conf.d/20-xdebug.ini
       - composer install
@@ -57,7 +57,7 @@ pipeline:
       matrix:
         TESTS: phan
   litmus-v1:
-    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-6
     commands:
       - bash tests/travis/install.sh sqlite
       - bash apps/dav/tests/travis/litmus-v1/script.sh
@@ -65,7 +65,7 @@ pipeline:
       matrix:
         TESTS: litmus-v1
   litmus-v2:
-    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-6
     commands:
       - bash tests/travis/install.sh sqlite
       - bash apps/dav/tests/travis/litmus-v2/script.sh
@@ -73,7 +73,7 @@ pipeline:
       matrix:
         TESTS: litmus-v2
   caldavtester-new-endpoint:
-    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-6
     commands:
       - bash tests/travis/install.sh sqlite
       - bash apps/dav/tests/travis/caldav/install.sh
@@ -82,7 +82,7 @@ pipeline:
       matrix:
         TESTS: caldavtester-new-endpoint
   caldavtester-old-endpoint:
-    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-6
     commands:
       - bash tests/travis/install.sh sqlite
       - bash apps/dav/tests/travis/caldav/install.sh
@@ -91,7 +91,7 @@ pipeline:
       matrix:
         TESTS: caldavtester-old-endpoint
   carddavtester-new-endpoint:
-    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-6
     commands:
       - bash tests/travis/install.sh sqlite
       - bash apps/dav/tests/travis/carddav/install.sh
@@ -100,7 +100,7 @@ pipeline:
       matrix:
         TESTS: carddavtester-new-endpoint
   carddavtester-old-endpoint:
-    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-6
     commands:
       - bash tests/travis/install.sh sqlite
       - bash apps/dav/tests/travis/carddav/install.sh
@@ -109,7 +109,7 @@ pipeline:
       matrix:
         TESTS: carddavtester-old-endpoint
   sqlite-php7.0-samba-native:
-      image: nextcloudci/samba-native-php7.0:samba-native-php7.0-1
+      image: nextcloudci/samba-native-php7.0:samba-native-php7.0-3
       commands:
         - smbd -D -FS &
         - ./autotest-external.sh sqlite smb-linux
@@ -122,7 +122,7 @@ pipeline:
         matrix:
           TESTS: sqlite-php7.0-samba-native
   sqlite-php7.0-samba-non-native:
-      image: nextcloudci/samba-non-native-php7.0:samba-non-native-php7.0-2
+      image: nextcloudci/samba-non-native-php7.0:samba-non-native-php7.0-4
       commands:
         - smbd -D -FS &
         - ./autotest-external.sh sqlite smb-linux
@@ -148,7 +148,7 @@ pipeline:
       matrix:
         TESTS: sqlite-php7.0-webdav-apache
   nodb-php5.6:
-    image: nextcloudci/php5.6:php5.6-7
+    image: nextcloudci/php5.6:php5.6-8
     commands:
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
     when:
@@ -156,7 +156,7 @@ pipeline:
         DB: NODB
         PHP: 5.6
   nodb-php7.0:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-16
     commands:
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
     when:
@@ -164,7 +164,7 @@ pipeline:
         DB: NODB
         PHP: "7.0"
   nodb-php7.1:
-    image: nextcloudci/php7.1:php7.1-12
+    image: nextcloudci/php7.1:php7.1-15
     commands:
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
     when:
@@ -172,7 +172,7 @@ pipeline:
         DB: NODB
         PHP: 7.1
   nodb-php7.2:
-    image: nextcloudci/php7.2:php7.2-4
+    image: nextcloudci/php7.2:php7.2-7
     commands:
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
     when:
@@ -180,7 +180,7 @@ pipeline:
         DB: NODB
         PHP: 7.2
   sqlite-php5.6:
-    image: nextcloudci/php5.6:php5.6-7
+    image: nextcloudci/php5.6:php5.6-8
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
     when:
@@ -188,7 +188,7 @@ pipeline:
         DB: sqlite
         PHP: 5.6
   sqlite-php7.0:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-16
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
     when:
@@ -196,7 +196,7 @@ pipeline:
         DB: sqlite
         PHP: "7.0"
   sqlite-php7.1:
-    image: nextcloudci/php7.1:php7.1-12
+    image: nextcloudci/php7.1:php7.1-15
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
     when:
@@ -204,7 +204,7 @@ pipeline:
         DB: sqlite
         PHP: 7.1
   sqlite-php7.2:
-    image: nextcloudci/php7.2:php7.2-4
+    image: nextcloudci/php7.2:php7.2-7
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
     when:
@@ -212,7 +212,7 @@ pipeline:
         DB: sqlite
         PHP: 7.2
   mysql-php5.6:
-    image: nextcloudci/php5.6:php5.6-7
+    image: nextcloudci/php5.6:php5.6-8
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
     when:
@@ -220,7 +220,7 @@ pipeline:
         DB: mysql
         PHP: 5.6
   mysql-php7.0:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-16
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
     when:
@@ -228,7 +228,7 @@ pipeline:
         DB: mysql
         PHP: "7.0"
   mysql-php7.1:
-    image: nextcloudci/php7.1:php7.1-12
+    image: nextcloudci/php7.1:php7.1-15
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
     when:
@@ -236,7 +236,7 @@ pipeline:
         DB: mysql
         PHP: 7.1
   mysql5.6-php5.6:
-    image: nextcloudci/php5.6:php5.6-7
+    image: nextcloudci/php5.6:php5.6-8
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
     when:
@@ -244,7 +244,7 @@ pipeline:
         DB: mysql5.6
         PHP: 5.6
   mysql5.6-php7.0:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-16
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
     when:
@@ -252,7 +252,7 @@ pipeline:
         DB: mysql5.6
         PHP: "7.0"
   mysql5.6-php7.1:
-    image: nextcloudci/php7.1:php7.1-12
+    image: nextcloudci/php7.1:php7.1-15
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
     when:
@@ -260,7 +260,7 @@ pipeline:
         DB: mysql5.6
         PHP: 7.1
   mysql5.5-php5.6:
-    image: nextcloudci/php5.6:php5.6-7
+    image: nextcloudci/php5.6:php5.6-8
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
     when:
@@ -268,7 +268,7 @@ pipeline:
         DB: mysql5.5
         PHP: 5.6
   mysql5.5-php7.0:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-16
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
     when:
@@ -276,7 +276,7 @@ pipeline:
         DB: mysql5.5
         PHP: "7.0"
   mysql5.5-php7.1:
-    image: nextcloudci/php7.1:php7.1-12
+    image: nextcloudci/php7.1:php7.1-15
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
     when:
@@ -284,7 +284,7 @@ pipeline:
         DB: mysql5.5
         PHP: 7.1
   postgres-php5.6:
-    image: nextcloudci/php5.6:php5.6-7
+    image: nextcloudci/php5.6:php5.6-8
     commands:
       - sleep 10 # gives the database enough time to initialize
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
@@ -293,7 +293,7 @@ pipeline:
         DB: postgres
         PHP: 5.6
   postgres-php7.0:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-16
     commands:
       - sleep 10 # gives the database enough time to initialize
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
@@ -302,7 +302,7 @@ pipeline:
         DB: postgres
         PHP: 7.0
   mysqlmb4-php5.6:
-    image: nextcloudci/php5.6:php5.6-7
+    image: nextcloudci/php5.6:php5.6-8
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
     when:
@@ -310,7 +310,7 @@ pipeline:
         DB: mysqlmb4
         PHP: 5.6
   mysqlmb4-php7.0:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-16
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
     when:
@@ -318,7 +318,7 @@ pipeline:
         DB: mysqlmb4
         PHP: "7.0"
   mysqlmb4-php7.1:
-    image: nextcloudci/php7.1:php7.1-12
+    image: nextcloudci/php7.1:php7.1-15
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
     when:
@@ -326,7 +326,7 @@ pipeline:
         DB: mysqlmb4
         PHP: 7.1
   integration-capabilities_features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -335,7 +335,7 @@ pipeline:
       matrix:
         TESTS: integration-capabilities_features
   integration-federation_features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -344,7 +344,7 @@ pipeline:
       matrix:
         TESTS: integration-federation_features
   integration-auth:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -353,7 +353,7 @@ pipeline:
       matrix:
         TESTS: integration-auth
   integration-maintenance-mode:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -362,7 +362,7 @@ pipeline:
       matrix:
         TESTS: integration-maintenance-mode
   integration-ratelimiting:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - ./occ config:system:set redis host --value=cache
@@ -377,7 +377,7 @@ pipeline:
       matrix:
         TESTS: integration-ratelimiting
   integration-carddav:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -386,7 +386,7 @@ pipeline:
       matrix:
         TESTS: integration-carddav
   integration-dav-v2:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -395,7 +395,7 @@ pipeline:
       matrix:
         TESTS: integration-dav-v2
   integration-ocs-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -404,7 +404,7 @@ pipeline:
       matrix:
         TESTS: integration-ocs-v1
   integration-sharing-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -413,7 +413,7 @@ pipeline:
       matrix:
         TESTS: integration-sharing-v1
   integration-sharing-v1-part2:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -422,7 +422,7 @@ pipeline:
       matrix:
         TESTS: integration-sharing-v1-part2
   integration-sharing-v1-part3:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -431,7 +431,7 @@ pipeline:
       matrix:
         TESTS: integration-sharing-v1-part3
   integration-checksums-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -440,7 +440,7 @@ pipeline:
       matrix:
         TESTS: integration-checksums
   integration-external-storage:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -449,7 +449,7 @@ pipeline:
       matrix:
         TESTS: integration-external-storage
   integration-provisioning-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -458,7 +458,7 @@ pipeline:
       matrix:
         TESTS: integration-provisioning-v1
   integration-tags:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -467,7 +467,7 @@ pipeline:
       matrix:
         TESTS: integration-tags
   integration-caldav:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -476,7 +476,7 @@ pipeline:
       matrix:
         TESTS: integration-caldav
   integration-comments:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -485,7 +485,7 @@ pipeline:
       matrix:
         TESTS: integration-comments
   integration-favorites:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -494,7 +494,7 @@ pipeline:
       matrix:
         TESTS: integration-favorites
   integration-provisioning-v2:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -503,7 +503,7 @@ pipeline:
       matrix:
         TESTS: integration-provisioning-v2
   integration-webdav-related:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -512,7 +512,7 @@ pipeline:
       matrix:
         TESTS: integration-webdav-related
   integration-sharees-features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -521,7 +521,7 @@ pipeline:
       matrix:
         TESTS: integration-sharees-features
   integration-sharees-v2-features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -530,7 +530,7 @@ pipeline:
       matrix:
         TESTS: integration-sharees-v2-features
   integration-setup-features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - cd build/integration
       - ./run.sh setup_features/setup.feature
@@ -538,7 +538,7 @@ pipeline:
       matrix:
         TESTS: integration-setup-features
   integration-filesdrop-features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -547,7 +547,7 @@ pipeline:
       matrix:
         TESTS: integration-filesdrop-features
   integration-transfer-ownership-features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -556,7 +556,7 @@ pipeline:
       matrix:
         TESTS: integration-transfer-ownership-features
   integration-ldap-features:
-      image: nextcloudci/integration-php7.0:integration-php7.0-4
+      image: nextcloudci/integration-php7.0:integration-php7.0-6
       commands:
         - ./occ maintenance:install --admin-pass=admin
         - ./occ app:enable user_ldap
@@ -566,7 +566,7 @@ pipeline:
         matrix:
           TESTS: integration-ldap-features
   integration-trashbin:
-    image: nextcloudci/integration-php7.0:integration-php7.0-4
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -575,36 +575,37 @@ pipeline:
       matrix:
         TESTS: integration-trashbin
   acceptance-access-levels:
-      image: nextcloudci/integration-php7.0:integration-php7.0-4
+      image: nextcloudci/integration-php7.0:integration-php7.0-6
       commands:
         - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-access-levels --selenium-server selenium:4444 allow-git-repository-modifications features/access-levels.feature
       when:
         matrix:
           TESTS-ACCEPTANCE: access-levels
   acceptance-app-files:
-      image: nextcloudci/integration-php7.0:integration-php7.0-4
+      image: nextcloudci/integration-php7.0:integration-php7.0-6
       commands:
         - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature
       when:
         matrix:
           TESTS-ACCEPTANCE: app-files
   acceptance-app-theming:
-      image: nextcloudci/integration-php7.0:integration-php7.0-4
+      image: nextcloudci/integration-php7.0:integration-php7.0-6
       commands:
         - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-theming --selenium-server selenium:4444 allow-git-repository-modifications features/app-theming.feature
       when:
         matrix:
           TESTS-ACCEPTANCE: app-theming
   acceptance-login:
-      image: nextcloudci/integration-php7.0:integration-php7.0-4
+      image: nextcloudci/integration-php7.0:integration-php7.0-6
       commands:
         - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-login --selenium-server selenium:4444 allow-git-repository-modifications features/login.feature
       when:
         matrix:
           TESTS-ACCEPTANCE: login
   nodb-codecov:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-16
     commands:
+      - phpenmod xdebug
       - TEST_SELECTION=NODB ./autotest.sh sqlite
       - 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"
@@ -613,8 +614,9 @@ pipeline:
       matrix:
         TESTS: nodb-codecov
   db-codecov:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-16
     commands:
+      - phpenmod xdebug
       - TEST_SELECTION=QUICKDB ./autotest.sh sqlite
       - 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"
@@ -623,8 +625,9 @@ pipeline:
       matrix:
         TESTS: db-codecov
   object-store:
-      image: nextcloudci/php7.0:php7.0-13
+      image: nextcloudci/php7.0:php7.0-16
       commands:
+        - phpenmod xdebug
         - TEST_SELECTION=PRIMARY-${OBJECT_STORE} ./autotest.sh sqlite
         - 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"
@@ -633,8 +636,9 @@ pipeline:
         matrix:
           TESTS: object-store
   memcache-memcached:
-    image: nextcloudci/php7.0-memcached:php7.0-memcached-6
+    image: nextcloudci/php7.0-memcached:php7.0-memcached-8
     commands:
+      - phpenmod xdebug
       - service memcached restart
       - ./autotest.sh sqlite tests/lib/Memcache/MemcachedTest.php
       - wget https://codecov.io/bash -O codecov.sh
@@ -644,8 +648,9 @@ pipeline:
       matrix:
         TEST: memcache-memcached
   memcache-redis-cluster:
-    image: nextcloudci/php7.0:php7.0-13
+    image: nextcloudci/php7.0:php7.0-16
     commands:
+      - phpenmod xdebug
       - ./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"