diff --git a/.drone.yml b/.drone.yml
index 4285703dc9e..cb20021cfd7 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-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   commands:
     - ./autotest-checkers.sh
   secrets: [ github_token ]
@@ -30,12 +30,12 @@ steps:
   commands:
     - git submodule update --init
 - name: litmus-v1
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
   commands:
     - bash tests/travis/install.sh sqlite
     - bash apps/dav/tests/travis/litmus-v1/script.sh
 - name: litmus-v2
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
   commands:
     - bash tests/travis/install.sh sqlite
     - bash apps/dav/tests/travis/litmus-v2/script.sh
@@ -58,7 +58,7 @@ steps:
   commands:
     - git submodule update --init
 - name: caldavtester-new-endpoint
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
   commands:
     - bash tests/travis/install.sh sqlite
     - bash apps/dav/tests/travis/caldav/install.sh
@@ -82,7 +82,7 @@ steps:
   commands:
     - git submodule update --init
 - name: caldavtester-old-endpoint
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
   commands:
     - bash tests/travis/install.sh sqlite
     - bash apps/dav/tests/travis/caldav/install.sh
@@ -106,7 +106,7 @@ steps:
   commands:
     - git submodule update --init
 - name: carddavtester-new-endpoint
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
   commands:
     - bash tests/travis/install.sh sqlite
     - bash apps/dav/tests/travis/carddav/install.sh
@@ -130,7 +130,7 @@ steps:
   commands:
     - git submodule update --init
 - name: carddavtester-old-endpoint
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
   commands:
     - bash tests/travis/install.sh sqlite
     - bash apps/dav/tests/travis/carddav/install.sh
@@ -153,8 +153,8 @@ steps:
   image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
   commands:
     - git submodule update --init
-- name: sqlite-php7.4-samba-native
-  image: ghcr.io/nextcloud/continuous-integration-samba-native-php7.4:latest
+- name: sqlite-php8.0-samba-native
+  image: ghcr.io/nextcloud/continuous-integration-samba-native-php8.0:latest
   commands:
     - smbd -D -FS &
     - ./autotest-external.sh sqlite smb-linux
@@ -164,8 +164,8 @@ steps:
     - 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-external-clover-sqlite-smb-linux.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-external-clover-sqlite-smb-linux.xml; fi"
 # Temporarily disabled because it times out for unknown reasons 98% of the time
-#- name: sqlite-php7.4-samba-non-native
-#  image: ghcr.io/nextcloud/continuous-integration-samba-non-native-php7.4:latest
+#- name: sqlite-php8.0-samba-non-native
+#  image: ghcr.io/nextcloud/continuous-integration-samba-non-native-php8.0:latest
 #  commands:
 #    - smbd -D -FS &
 #    - ./autotest-external.sh sqlite smb-linux
@@ -185,15 +185,15 @@ trigger:
 
 ---
 kind: pipeline
-name: sqlite-php7.4-webdav-apache
+name: sqlite-php8.0-webdav-apache
 
 steps:
 - name: submodules
   image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
   commands:
     - git submodule update --init
-- name: sqlite-php7.4-webdav-apache
-  image: ghcr.io/nextcloud/continuous-integration-webdav-apache-php7.4:latest
+- name: sqlite-php8.0-webdav-apache
+  image: ghcr.io/nextcloud/continuous-integration-webdav-apache-php8.0:latest
   commands:
     - apache2ctl start
     - ./autotest-external.sh sqlite webdav-apachedrone
@@ -224,11 +224,6 @@ steps:
   image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
   commands:
     - git submodule update --init
-- name: nodb-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=NODB ./autotest.sh sqlite
 - name: nodb-php8.0
   image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   commands:
@@ -256,11 +251,6 @@ steps:
   image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
   commands:
     - git submodule update --init
-- name: sqlite-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 sqlite
 - name: sqlite-php8.0
   image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   commands:
@@ -281,15 +271,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.2-php7.4
+name: mariadb10.2-php8.0
 
 steps:
 - name: submodules
   image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
   commands:
     - git submodule update --init
-- name: mariadb10.2-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+- name: mariadb10.2-php8.0
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -395,15 +385,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mysql8.0-php7.4
+name: mysql8.0-php8.0
 
 steps:
 - name: submodules
   image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
   commands:
     - git submodule update --init
-- name: mysql-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+- name: mysql-php8.0
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -434,15 +424,15 @@ trigger:
 
 ---
 kind: pipeline
-name: postgres10-php7.4
+name: postgres10-php8.0
 
 steps:
 - name: submodules
   image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
   commands:
     - git submodule update --init
-- name: postgres-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+- name: postgres-php8.0
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -470,15 +460,15 @@ trigger:
 
 ---
 kind: pipeline
-name: postgres11-php7.4
+name: postgres11-php8.0
 
 steps:
 - name: submodules
   image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
   commands:
     - git submodule update --init
-- name: postgres-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+- name: postgres-php8.0
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -586,7 +576,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-capabilities_features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -611,7 +601,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-collaboration_features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -636,7 +626,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-federation_features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin
@@ -661,7 +651,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-auth
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -686,7 +676,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-avatar
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -711,7 +701,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-maintenance-mode
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -736,7 +726,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-ratelimiting
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -771,7 +761,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-carddav
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -796,7 +786,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-dav-v2
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -821,7 +811,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-ocs-v1
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -846,7 +836,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-checksums-v1
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -871,7 +861,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-external-storage
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -896,7 +886,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-provisioning-v1
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -921,7 +911,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-tags
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -946,7 +936,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-caldav
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -971,7 +961,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-comments
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -996,7 +986,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-comments-search
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1021,7 +1011,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-contacts-menu
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1046,7 +1036,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-favorites
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1071,7 +1061,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-provisioning-v2
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1096,7 +1086,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-webdav-related
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1121,7 +1111,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-sharees-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1146,7 +1136,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-sharees-v2-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1171,7 +1161,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-sharing-v1
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1196,7 +1186,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-sharing-v1-part2
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1221,7 +1211,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-sharing-v1-part3
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1252,7 +1242,7 @@ steps:
     # build them.
     - git clone --depth 1 https://github.com/nextcloud/spreed apps/spreed
 - name: integration-sharing-v1-video-verification
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1277,7 +1267,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-setup-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - cd build/integration
@@ -1301,7 +1291,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-filesdrop-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1326,7 +1316,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-transfer-ownership-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1351,7 +1341,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-ldap-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1376,7 +1366,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-ldap-openldap-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1417,7 +1407,7 @@ steps:
       commands:
           - git submodule update --init
     - name: integration-ldap-openldap-uid-features
-      image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+      image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
       commands:
           - bash tests/drone-run-integration-tests.sh || exit 0
           - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1459,7 +1449,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-ldap-openldap-numerical-id-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1500,7 +1490,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-trashbin
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1525,7 +1515,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-remote-api
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1550,7 +1540,7 @@ steps:
   commands:
     - git submodule update --init
 - name: integration-download
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
     - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1575,7 +1565,7 @@ steps:
   commands:
     - git submodule update --init
 - name: acceptance-access-levels
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
   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
 
@@ -1605,7 +1595,7 @@ steps:
   commands:
     - git submodule update --init
 - name: acceptance-app-files
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
   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
 
@@ -1635,7 +1625,7 @@ steps:
   commands:
     - git submodule update --init
 - name: acceptance-app-files-sharing
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
   commands:
     - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing.feature
 
@@ -1665,7 +1655,7 @@ steps:
   commands:
     - git submodule update --init
 - name: acceptance-app-files-sharing-link
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
   commands:
     - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing-link --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing-link.feature
 
@@ -1695,7 +1685,7 @@ steps:
   commands:
     - git submodule update --init
 - name: acceptance-app-files-tags
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
   commands:
     - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-tags --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-tags.feature
 
@@ -1725,7 +1715,7 @@ steps:
   commands:
     - git submodule update --init
 - name: acceptance-header
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
   commands:
     - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-header --selenium-server selenium:4444 allow-git-repository-modifications features/header.feature
 
@@ -1755,7 +1745,7 @@ steps:
   commands:
     - git submodule update --init
 - name: acceptance-login
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
   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
 
@@ -1785,7 +1775,7 @@ steps:
   commands:
     - git submodule update --init
 - name: acceptance-users
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
   commands:
     - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-users --selenium-server selenium:4444 allow-git-repository-modifications features/users.feature
 
@@ -1815,7 +1805,7 @@ steps:
   commands:
     - git submodule update --init
 - name: acceptance-apps
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
   commands:
     - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-apps --selenium-server selenium:4444 allow-git-repository-modifications features/apps.feature
 
@@ -1845,7 +1835,7 @@ steps:
   commands:
     - git submodule update --init
 - name: nodb-codecov
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -1877,7 +1867,7 @@ steps:
   commands:
     - git submodule update --init
 - name: db-codecov
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -1918,7 +1908,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   environment:
       OBJECT_STORE: s3
       CODECOV_TOKEN:
@@ -1948,7 +1938,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
   environment:
       OBJECT_STORE: azure
       CODECOV_TOKEN:
@@ -1984,7 +1974,7 @@ steps:
   commands:
     - git submodule update --init
 - name: memcache-memcached
-  image: ghcr.io/nextcloud/continuous-integration-php7.4-memcached:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0-memcached:latest
   commands:
     - phpenmod xdebug
     - service memcached restart