diff --git a/.drone.yml b/.drone.yml
index 6ff0612728..85b83eb20c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,14 +13,14 @@ pipeline:
       matrix:
         TESTS: jsunit
   check-autoloader:
-    image: nextcloudci/php7.0:php7.0-6
+    image: nextcloudci/php7.0:php7.0-7
     commands:
       - bash ./build/autoloaderchecker.sh
     when:
       matrix:
         TESTS: check-autoloader
   app-check-code:
-    image: nextcloudci/php7.0:php7.0-6
+    image: nextcloudci/php7.0:php7.0-7
     commands:
       - ./occ app:check-code admin_audit
       - ./occ app:check-code comments
@@ -33,14 +33,14 @@ pipeline:
       matrix:
         TESTS: app-check-code
   signed-off-check:
-    image: nextcloudci/php7.0:php7.0-6
+    image: nextcloudci/php7.0:php7.0-7
     commands:
       - php ./build/signed-off-checker.php
     when:
       matrix:
         TESTS: signed-off-check
   htaccess-checker:
-    image: nextcloudci/php7.0:php7.0-6
+    image: nextcloudci/php7.0:php7.0-7
     commands:
       - php ./build/htaccess-checker.php
     when:
@@ -55,7 +55,7 @@ pipeline:
       matrix:
         TESTS: syntax-php5.6
   syntax-php7.0:
-    image: nextcloudci/php7.0:php7.0-6
+    image: nextcloudci/php7.0:php7.0-7
     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 .
@@ -131,7 +131,7 @@ pipeline:
         DB: NODB
         PHP: 5.6
   nodb-php7.0:
-    image: nextcloudci/php7.0:php7.0-6
+    image: nextcloudci/php7.0:php7.0-7
     commands:
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
     when:
@@ -155,7 +155,7 @@ pipeline:
         DB: sqlite
         PHP: 5.6
   sqlite-php7.0:
-    image: nextcloudci/php7.0:php7.0-6
+    image: nextcloudci/php7.0:php7.0-7
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
     when:
@@ -196,7 +196,7 @@ pipeline:
         DB: mysqlmb4
         PHP: 5.6
   integration-capabilities_features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -205,7 +205,7 @@ pipeline:
       matrix:
         TESTS: integration-capabilities_features
   integration-federation_features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -214,7 +214,7 @@ pipeline:
       matrix:
         TESTS: integration-federation_features
   integration-auth:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -223,7 +223,7 @@ pipeline:
       matrix:
         TESTS: integration-auth
   integration-carddav:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -232,7 +232,7 @@ pipeline:
       matrix:
         TESTS: integration-carddav
   integration-dav-v2:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -241,7 +241,7 @@ pipeline:
       matrix:
         TESTS: integration-dav-v2
   integration-ocs-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -250,7 +250,7 @@ pipeline:
       matrix:
         TESTS: integration-ocs-v1
   integration-sharing-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -259,7 +259,7 @@ pipeline:
       matrix:
         TESTS: integration-sharing-v1
   integration-checksums-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -268,7 +268,7 @@ pipeline:
       matrix:
         TESTS: integration-checksums
   integration-external-storage:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -277,7 +277,7 @@ pipeline:
       matrix:
         TESTS: integration-external-storage
   integration-provisioning-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -286,7 +286,7 @@ pipeline:
       matrix:
         TESTS: integration-provisioning-v1
   integration-tags:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -295,7 +295,7 @@ pipeline:
       matrix:
         TESTS: integration-tags
   integration-caldav:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -304,7 +304,7 @@ pipeline:
       matrix:
         TESTS: integration-caldav
   integration-comments:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -313,7 +313,7 @@ pipeline:
       matrix:
         TESTS: integration-comments
   integration-favorites:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -322,7 +322,7 @@ pipeline:
       matrix:
         TESTS: integration-favorites
   integration-provisioning-v2:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -331,7 +331,7 @@ pipeline:
       matrix:
         TESTS: integration-provisioning-v2
   integration-webdav-related:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -340,7 +340,7 @@ pipeline:
       matrix:
         TESTS: integration-webdav-related
   integration-sharees-features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -349,7 +349,7 @@ pipeline:
       matrix:
         TESTS: integration-sharees-features
   integration-setup-features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - cd build/integration
       - ./run.sh setup_features/setup.feature
@@ -357,7 +357,7 @@ pipeline:
       matrix:
         TESTS: integration-setup-features
   integration-filesdrop-features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-2
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -366,7 +366,7 @@ pipeline:
       matrix:
         TESTS: integration-filesdrop-features
   nodb-codecov:
-    image: nextcloudci/php7.0:php7.0-6
+    image: nextcloudci/php7.0:php7.0-7
     commands:
       - TEST_SELECTION=NODB ./autotest.sh sqlite
       - wget https://codecov.io/bash -O codecov.sh
@@ -376,7 +376,7 @@ pipeline:
       matrix:
         TESTS: nodb-codecov
   db-codecov:
-    image: nextcloudci/php7.0:php7.0-6
+    image: nextcloudci/php7.0:php7.0-7
     commands:
       - TEST_SELECTION=QUICKDB ./autotest.sh sqlite
       - wget https://codecov.io/bash -O codecov.sh