diff --git a/.drone.yml b/.drone.yml
index 5cadb47d976..a628f7a5111 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,7 +7,7 @@ steps:
   commands:
     - git submodule update --init
 - name: checkers
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
   commands:
     - ./autotest-checkers.sh
   secrets: [ github_token ]
@@ -225,7 +225,7 @@ steps:
   commands:
     - git submodule update --init
 - name: nodb-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
@@ -257,7 +257,7 @@ steps:
   commands:
     - git submodule update --init
 - name: sqlite-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
@@ -281,15 +281,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.1-php7.4
+name: mariadb10.2-php7.4
 
 steps:
 - name: submodules
   image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
   commands:
     - git submodule update --init
-- name: mariadb10.1-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+- name: mariadb10.2-php7.4
+  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -298,7 +298,7 @@ services:
 - name: cache
   image: ghcr.io/nextcloud/continuous-integration-redis:latest
 - name: mariadb
-  image: ghcr.io/nextcloud/continuous-integration-mariadb-10.1:10.1
+  image: ghcr.io/nextcloud/continuous-integration-mariadb-10.2:10.2
   environment:
     MYSQL_ROOT_PASSWORD: owncloud
     MYSQL_USER: oc_autotest
@@ -397,7 +397,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mysql-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -426,7 +426,7 @@ trigger:
 
 ---
 kind: pipeline
-name: postgres9.6-php7.4
+name: postgres10-php7.4
 
 steps:
 - name: submodules
@@ -438,13 +438,13 @@ steps:
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
-    - POSTGRES=9 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+    - POSTGRES=10 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
 
 services:
 - name: cache
   image: ghcr.io/nextcloud/continuous-integration-redis:latest
-- name: postgres-9
-  image: ghcr.io/nextcloud/continuous-integration-postgres-9:postgres-9.6
+- name: postgres-10
+  image: ghcr.io/nextcloud/continuous-integration-postgres-10:postgres-10
   environment:
     POSTGRES_USER: oc_autotest
     POSTGRES_DB: oc_autotest_dummy
@@ -470,7 +470,7 @@ steps:
   commands:
     - git submodule update --init
 - name: postgres-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -1831,7 +1831,7 @@ steps:
   commands:
     - git submodule update --init
 - name: nodb-codecov
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -1863,7 +1863,7 @@ steps:
   commands:
     - git submodule update --init
 - name: db-codecov
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -1904,7 +1904,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
   environment:
       OBJECT_STORE: s3
       CODECOV_TOKEN:
@@ -1934,7 +1934,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
   environment:
       OBJECT_STORE: azure
       CODECOV_TOKEN: