diff --git a/.github/workflows/app-upgrade.yml b/.github/workflows/app-upgrade.yml
index 427cb735f..0f35166bf 100644
--- a/.github/workflows/app-upgrade.yml
+++ b/.github/workflows/app-upgrade.yml
@@ -16,7 +16,7 @@ on:
       php_versions:
         required: false
         type: string
-        default: '8.3'
+        default: '8.4'
 
 jobs:
   create-matrix:
@@ -32,7 +32,7 @@ jobs:
         env:
           NEXTCLOUD_VERSIONS: ${{ inputs.nextcloud_versions }}
           PHP_VERSIONS: ${{ inputs.php_versions }}
-          DEFAULT_PHP_VERSION: '8.3'
+          DEFAULT_PHP_VERSION: '8.4'
           DEFAULT_DATABASE: 'mysql'
         run: |
           MATRIX=$(./.github/scripts/generate-matrix.sh)
@@ -65,7 +65,7 @@ jobs:
           - ${{ github.workspace }}/build-app:/var/www/html/build-app-shared
 
       database-mysql:
-        image: ghcr.io/nextcloud/continuous-integration-mariadb-10.5:latest
+        image: ghcr.io/nextcloud/continuous-integration-mariadb-11.8:latest
         env:
           MYSQL_ROOT_PASSWORD: 'nextcloud'
           MYSQL_PASSWORD: 'nextcloud'
diff --git a/.github/workflows/shared_workflow.yml b/.github/workflows/shared_workflow.yml
index 35232dfe0..09f23b7d8 100644
--- a/.github/workflows/shared_workflow.yml
+++ b/.github/workflows/shared_workflow.yml
@@ -14,7 +14,7 @@ on:
       php_versions:
         required: false
         type: string
-        default: '8.2 8.3 8.4'
+        default: '8.3 8.4 8.5'
 
 name: CI
 
@@ -93,14 +93,16 @@ jobs:
         env:
           NEXTCLOUD_VERSIONS: ${{ inputs.nextcloud_versions }}
           PHP_VERSIONS: ${{ inputs.php_versions }}
-          DEFAULT_PHP_VERSION: '8.3'
+          DEFAULT_PHP_VERSION: '8.4'
           DEFAULT_DATABASE: 'mysql'
           EXTRA_DATABASES: 'pgsql'
         run: |
           MATRIX=$(./.github/scripts/generate-matrix.sh)
           echo "matrix={\"include\": [$MATRIX]}" >> $GITHUB_OUTPUT
+          echo "default_php_version=${DEFAULT_PHP_VERSION}" >> $GITHUB_OUTPUT
     outputs:
       matrix: ${{ steps.create-matrix.outputs.matrix }}
+      default_php_version: ${{ steps.create-matrix.outputs.default_php_version }}
 
   api-phpunit-tests:
     name: PHP Unit & API tests
@@ -129,14 +131,14 @@ jobs:
           - ${{ github.workspace }}:/var/www/html/apps-shared
 
       database-pgsql:
-        image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest
+        image: ghcr.io/nextcloud/continuous-integration-postgres-18:latest
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_USER: postgres
           POSTGRES_DB: nextcloud
 
       database-mysql:
-        image: ghcr.io/nextcloud/continuous-integration-mariadb-10.5:latest
+        image: ghcr.io/nextcloud/continuous-integration-mariadb-11.8:latest
         env:
           MYSQL_ROOT_PASSWORD: 'nextcloud'
           MYSQL_PASSWORD: 'nextcloud'
@@ -217,7 +219,12 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('./composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
-      - name: Install PHP dependencies
+      - name: Composer update
+        if: ${{ matrix.phpVersion == '8.5' }}
+        run: composer update
+
+      - name: Composer install
+        if: ${{ matrix.phpVersion != '8.5' }}
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Prepare Nextcloud server (for phpunit and psalm)
@@ -258,14 +265,14 @@ jobs:
           make phpunit || (echo "A few of the unit tests were unsuccessful. Rerunning the unit test once again......" && make phpunit)
 
       - name: Setup .NET Core # this is required to execute Convert PHP cobertura coverage to lcov step
-        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.2' }}
+        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == needs.create-matrix.outputs.default_php_version }}
         uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309
         with:
           dotnet-version: 6.0.101
           dotnet-quality: 'ga'
 
       - name: Convert PHP cobertura coverage to lcov
-        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.2' }}
+        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == needs.create-matrix.outputs.default_php_version }}
         uses: danielpalme/ReportGenerator-GitHub-Action@abaac9fef72e4116bfc69905d51062790bda0335
         with:
           reports: 'integration_openproject/server/apps/integration_openproject/coverage/php/cobertura.xml' # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
@@ -284,7 +291,7 @@ jobs:
           toolpath: 'reportgeneratortool' # Default directory for installing the dotnet tool.
 
       - name: PHP Code Coverage Summary Report
-        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.2' }}
+        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == needs.create-matrix.outputs.default_php_version }}
         uses: romeovs/lcov-reporter-action@dda1c9b1fa1622b225e9acd87a248751dbcc6ada
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -293,7 +300,7 @@ jobs:
           title: 'PHP Code Coverage'
 
       - name: PHP coverage check
-        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.2' }}
+        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == needs.create-matrix.outputs.default_php_version }}
         uses: VeryGoodOpenSource/very_good_coverage@3b475421464c564c0714d92ce02742bd81fa9eda
         with:
           min_coverage: '56'