diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index 041d2175271..debd6cf40f8 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -54,12 +54,16 @@ jobs:
     if: needs.changes.outputs.src != 'false' && ${{ github.repository_owner != 'nextcloud-gmbh' }}
 
     strategy:
+      fail-fast: false
       matrix:
-        oracle-versions: ['11']
-        php-versions: ['8.1', '8.2', '8.3']
         include:
-          - php-versions: '8.3'
+          - oracle-versions: '18'
+            php-versions: '8.1'
             coverage: ${{ github.event_name != 'pull_request' }}
+          - oracle-versions: '21'
+            php-versions: '8.2'
+          - oracle-versions: '23'
+            php-versions: '8.3'
 
     name: Oracle ${{ matrix.oracle-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
@@ -71,7 +75,7 @@ jobs:
         options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
       oracle:
-        image: ghcr.io/gvenzl/oracle-xe:${{ matrix.oracle-versions }}
+        image: gvenzl/oracle-${{ matrix.oracle-versions < 23 && 'xe' || 'free'  }}:${{ matrix.oracle-versions }}
 
         # Provide passwords and other environment variables to container
         env:
@@ -81,7 +85,7 @@ jobs:
 
         # Forward Oracle port
         ports:
-          - 4444:1521/tcp
+          - 1521:1521/tcp
 
         # Provide healthcheck script options for startup
         options: >-
@@ -112,12 +116,12 @@ jobs:
 
       - name: Set up Nextcloud
         env:
-          DB_PORT: 4444
+          DB_PORT: 1521
         run: |
           mkdir data
           cp tests/redis.config.php config/
           cp tests/preseed-config.php config/config.php
-          ./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=oc_autotest --database-pass=nextcloud --admin-user admin --admin-pass admin
+          ./occ maintenance:install --verbose --database=oci --database-name=${{ matrix.oracle-versions < 23 && 'XE' || 'FREE'  }} --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=oc_autotest --database-pass=nextcloud --admin-user admin --admin-pass admin
           php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
 
       - name: PHPUnit