diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml
deleted file mode 100644
index 11590ffb04af1..0000000000000
--- a/.github/workflows/lint-eslint.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Lint
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    name: eslint
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@v1.1
-        id: versions
-        with:
-          fallbackNode: '^12'
-          fallbackNpm: '^6'
-
-      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ steps.versions.outputs.nodeVersion }}
-
-      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
-        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Lint
-        run: npm run lint
diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml
index 207329cfd4df2..9f364565869e2 100644
--- a/.github/workflows/oci.yml
+++ b/.github/workflows/oci.yml
@@ -43,11 +43,11 @@ jobs:
           extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
           tools: phpunit:9
           coverage: none
+          ini-file: development
 
       - name: composer i
         run: |
           composer i
-          composer require --dev phpunit/phpunit
 
       - name: Set up Nextcloud
         run: |
@@ -57,4 +57,4 @@ jobs:
 
       - name: PHPUnit
         working-directory: tests
-        run: ../lib/composer/bin/phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB
+        run: phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB
diff --git a/.github/workflows/phpunit-custom.yml b/.github/workflows/phpunit-custom.yml
deleted file mode 100644
index 0b48c719cf127..0000000000000
--- a/.github/workflows/phpunit-custom.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: PHPUnit custom
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - master
-      - stable*
-
-jobs:
-  phpunit-custom:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-          path: server
-
-      - name: Install dependencies
-        run: |
-          sudo sed -i -e "s/\# deb-src/deb-src/g" /etc/apt/sources.list
-          sudo apt-get update
-          sudo apt-get build-dep php php-ldap php-zip php-curl php-mbstsring php-intl php-gd php-imagick
-
-      - name: Checkout php
-        run: git clone --depth=1 https://github.com/php/php-src.git
-
-      - name: Build php
-        working-directory: php-src
-        run: |
-          ./buildconf
-          ./configure --with-ldap --with-ldap-sasl --with-zip --with-curl --with-openssl --with-zlib --enable-mbstring --enable-pcntl --enable-intl --with-password-argon2 --with-freetype --with-jpeg --enable-gd --with-imagick
-          #make
-
-      - name: composer i
-        working-directory: server
-        run: |
-          composer i
-          composer require --dev phpunit/phpunit
-
-      - name: PHPUnit
-        working-directory: server
-        run: PATH=../php-src/sapi/cli:$PATH ./autotest.sh sqlite
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index 905401bd636f4..441e79b1205e1 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -46,6 +46,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
+          tools: phpunit
           extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql
           coverage: none
           update: true
@@ -54,7 +55,6 @@ jobs:
       - name: composer i
         run: |
           composer i
-          composer require --dev phpunit/phpunit
 
       - name: Set up Nextcloud
         env:
@@ -66,4 +66,4 @@ jobs:
 
       - name: PHPUnit
         working-directory: tests
-        run: ../lib/composer/bin/phpunit --configuration phpunit-autotest.xml
+        run: phpunit --configuration phpunit-autotest.xml