diff --git a/.drone.yml b/.drone.yml
index 5c407bf866..e260ae37c4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,21 +3,21 @@ pipeline:
     image: plugins/git
     depth: 1
   jsunit:
-    image: nextcloudci/jsunit:1.0.6
+    image: nextcloudci/jsunit:jsunit-5
     commands:
       - ./autotest-js.sh
     when:
       matrix:
         TESTS: jsunit
   check-autoloader:
-    image: nextcloudci/php7.0:php7.0-2
+    image: nextcloudci/php7.0:php7.0-6
     commands:
       - bash ./build/autoloaderchecker.sh
     when:
       matrix:
         TESTS: check-autoloader
   app-check-code:
-    image: nextcloudci/php7.0:php7.0-2
+    image: nextcloudci/php7.0:php7.0-6
     commands:
       - ./occ app:check-code admin_audit
       - ./occ app:check-code comments
@@ -30,21 +30,21 @@ pipeline:
       matrix:
         TESTS: app-check-code
   signed-off-check:
-    image: nextcloudci/php7.0:php7.0-2
+    image: nextcloudci/php7.0:php7.0-6
     commands:
       - php ./build/signed-off-checker.php
     when:
       matrix:
         TESTS: signed-off-check
   htaccess-checker:
-    image: nextcloudci/php7.0:php7.0-2
+    image: nextcloudci/php7.0:php7.0-6
     commands:
       - php ./build/htaccess-checker.php
     when:
       matrix:
         TESTS: htaccess-checker
   syntax-php5.6:
-    image: nextcloudci/php5.6:php5.6-2
+    image: nextcloudci/php5.6:php5.6-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 .
@@ -52,7 +52,7 @@ pipeline:
       matrix:
         TESTS: syntax-php5.6
   syntax-php7.0:
-    image: nextcloudci/php7.0:php7.0-2
+    image: nextcloudci/php7.0:php7.0-6
     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 .
@@ -60,7 +60,7 @@ pipeline:
       matrix:
         TESTS: syntax-php7.0
   litmus-v1:
-    image: nextcloudci/litmus-php7.0:litmus-php7.0-2
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
     commands:
       - bash tests/travis/install.sh sqlite
       - bash apps/dav/tests/travis/litmus-v1/script.sh
@@ -68,7 +68,7 @@ pipeline:
       matrix:
         TESTS: litmus-v1
   litmus-v2:
-    image: nextcloudci/litmus-php7.0:litmus-php7.0-2
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
     commands:
       - bash tests/travis/install.sh sqlite
       - bash apps/dav/tests/travis/litmus-v2/script.sh
@@ -76,7 +76,7 @@ pipeline:
       matrix:
         TESTS: litmus-v2
   caldavtester:
-    image: nextcloudci/litmus-php7.0:litmus-php7.0-2
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
     commands:
       - bash tests/travis/install.sh sqlite
       - bash apps/dav/tests/travis/caldav/install.sh
@@ -85,7 +85,7 @@ pipeline:
       matrix:
         TESTS: caldavtester
   carddavtester:
-    image: nextcloudci/litmus-php7.0:litmus-php7.0-2
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
     commands:
       - bash tests/travis/install.sh sqlite
       - bash apps/dav/tests/travis/carddav/install.sh
@@ -94,7 +94,7 @@ pipeline:
       matrix:
         TESTS: carddavtester
   nodb-php5.6:
-    image: nextcloudci/php5.6:php5.6-2
+    image: nextcloudci/php5.6:php5.6-7
     commands:
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
     when:
@@ -102,7 +102,7 @@ pipeline:
         DB: NODB
         PHP: 5.6
   nodb-php7.0:
-    image: nextcloudci/php7.0:php7.0-2
+    image: nextcloudci/php7.0:php7.0-6
     commands:
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
     when:
@@ -110,7 +110,7 @@ pipeline:
         DB: NODB
         PHP: "7.0"
   nodb-php7.1:
-    image: nextcloudci/php7.1:php7.1-8
+    image: nextcloudci/php7.1:php7.1-9
     commands:
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
     when:
@@ -118,7 +118,7 @@ pipeline:
         DB: NODB
         PHP: 7.1
   sqlite-php5.6:
-    image: nextcloudci/php5.6:php5.6-2
+    image: nextcloudci/php5.6:php5.6-7
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
     when:
@@ -126,7 +126,7 @@ pipeline:
         DB: sqlite
         PHP: 5.6
   sqlite-php7.0:
-    image: nextcloudci/php7.0:php7.0-2
+    image: nextcloudci/php7.0:php7.0-6
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
     when:
@@ -134,7 +134,7 @@ pipeline:
         DB: sqlite
         PHP: "7.0"
   sqlite-php7.1:
-    image: nextcloudci/php7.1:php7.1-8
+    image: nextcloudci/php7.1:php7.1-9
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
     when:
@@ -142,7 +142,7 @@ pipeline:
         DB: sqlite
         PHP: 7.1
   mysql-php5.6:
-    image: nextcloudci/php5.6:php5.6-2
+    image: nextcloudci/php5.6:php5.6-7
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
     when:
@@ -150,7 +150,7 @@ pipeline:
         DB: mysql
         PHP: 5.6
   postgres-php5.6:
-    image: nextcloudci/php5.6:php5.6-2
+    image: nextcloudci/php5.6:php5.6-7
     commands:
       - sleep 10 # gives the database enough time to initialize
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
@@ -159,7 +159,7 @@ pipeline:
         DB: postgres
         PHP: 5.6
   mysqlmb4-php5.6:
-    image: nextcloudci/php5.6:php5.6-2
+    image: nextcloudci/php5.6:php5.6-7
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
     when:
@@ -167,7 +167,7 @@ pipeline:
         DB: mysqlmb4
         PHP: 5.6
   integration-capabilities_features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -176,7 +176,7 @@ pipeline:
       matrix:
         TESTS: integration-capabilities_features
   integration-federation_features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -185,7 +185,7 @@ pipeline:
       matrix:
         TESTS: integration-federation_features
   integration-auth:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -194,7 +194,7 @@ pipeline:
       matrix:
         TESTS: integration-auth
   integration-carddav:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -203,7 +203,7 @@ pipeline:
       matrix:
         TESTS: integration-carddav
   integration-dav-v2:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -212,7 +212,7 @@ pipeline:
       matrix:
         TESTS: integration-dav-v2
   integration-ocs-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -221,7 +221,7 @@ pipeline:
       matrix:
         TESTS: integration-ocs-v1
   integration-sharing-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -230,7 +230,7 @@ pipeline:
       matrix:
         TESTS: integration-sharing-v1
   integration-checksums-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -239,7 +239,7 @@ pipeline:
       matrix:
         TESTS: integration-checksums
   integration-external-storage:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -248,7 +248,7 @@ pipeline:
       matrix:
         TESTS: integration-external-storage
   integration-provisioning-v1:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -257,7 +257,7 @@ pipeline:
       matrix:
         TESTS: integration-provisioning-v1
   integration-tags:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -266,7 +266,7 @@ pipeline:
       matrix:
         TESTS: integration-tags
   integration-caldav:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -275,7 +275,7 @@ pipeline:
       matrix:
         TESTS: integration-caldav
   integration-comments:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -284,7 +284,7 @@ pipeline:
       matrix:
         TESTS: integration-comments
   integration-favorites:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -293,7 +293,7 @@ pipeline:
       matrix:
         TESTS: integration-favorites
   integration-provisioning-v2:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -302,7 +302,7 @@ pipeline:
       matrix:
         TESTS: integration-provisioning-v2
   integration-webdav-related:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -311,7 +311,7 @@ pipeline:
       matrix:
         TESTS: integration-webdav-related
   integration-sharees-features:
-    image: nextcloudci/integration-php7.0:integration-php7.0-1
+    image: nextcloudci/integration-php7.0:integration-php7.0-2
     commands:
       - ./occ maintenance:install --admin-pass=admin
       - cd build/integration
@@ -320,7 +320,7 @@ pipeline:
       matrix:
         TESTS: integration-sharees-features
   nodb-codecov:
-    image: nextcloudci/php7.0:php7.0-2
+    image: nextcloudci/php7.0:php7.0-6
     commands:
       - TEST_SELECTION=NODB ./autotest.sh sqlite
       - wget https://codecov.io/bash -O codecov.sh
@@ -330,7 +330,7 @@ pipeline:
       matrix:
         TESTS: nodb-codecov
   db-codecov:
-    image: nextcloudci/php7.0:php7.0-2
+    image: nextcloudci/php7.0:php7.0-6
     commands:
       - TEST_SELECTION=QUICKDB ./autotest.sh sqlite
       - wget https://codecov.io/bash -O codecov.sh