diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 5f6a09aa3..89742ebed 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -20,12 +20,9 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        include:
-          - php-versions: '8.1'
-            server-versions: 'master'
-          - php-versions: '8.1'
-            server-versions: 'stable30'
+        php-versions: ['8.1']
         databases: ['sqlite']
+        server-versions: ['master', 'stable30']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -89,9 +86,9 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.1', '8.2', '8.3', '8.4']
         databases: ['mysql']
-        server-versions: ['master']
+        server-versions: ['master', 'stable30']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -118,7 +115,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Patch for nightly PHP
-        if: ${{ matrix.php-versions == '8.2' }}
+        if: ${{ matrix.php-versions == '8.4' }}
         run: |
           echo "<?php" > lib/versioncheck.php
           sed -i 's/max-version="8.1"/max-version="8.2"/' apps/${{ env.APP_NAME }}/appinfo/info.xml
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 907d4a4b5..fe818632a 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -43,7 +43,7 @@
 	<screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png</screenshot>
 
 	<dependencies>
-		<php min-version="8.1" max-version="8.3" />
+		<php min-version="8.1" max-version="8.4" />
 		<nextcloud min-version="30" max-version="31" />
 	</dependencies>