diff --git a/.drone.yml b/.drone.yml
index 8217524fbb..7bd213a042 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -214,43 +214,6 @@ trigger:
     - pull_request
     - push
 
----
-kind: pipeline
-name: nodb
-
-steps:
-- name: submodules
-  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
-  commands:
-    - git submodule update --init
-- name: nodb-php7.3
-  image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
-- name: nodb-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
-  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:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
-
-services:
-- name: cache
-  image: ghcr.io/nextcloud/continuous-integration-redis:latest
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
 ---
 kind: pipeline
 name: sqlite
diff --git a/.github/workflows/oci.yml b/.github/workflows/phpunit.yml
similarity index 64%
rename from .github/workflows/oci.yml
rename to .github/workflows/phpunit.yml
index 04d1dfdbab..40b16cf632 100644
--- a/.github/workflows/oci.yml
+++ b/.github/workflows/phpunit.yml
@@ -8,12 +8,30 @@ on:
       - stable*
 
 jobs:
+  phpunit-nodb:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        php-versions: [ '7.3', '7.4', '8.0' ]
+    steps:
+      - name: Checkout server
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          tools: phpunit:8.5.2
+          coverage: none
+      - name: PHPUnit
+        run: NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+
   phpunit-oci8:
     runs-on: ubuntu-20.04
 
     strategy:
-      # do not stop on another job's failure
-      fail-fast: false
       matrix:
         php-versions: [ '7.4' ]
         databases: [ 'oci' ]
@@ -29,13 +47,8 @@ jobs:
     steps:
       - name: Checkout server
         uses: actions/checkout@v2
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        with:
+          submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@v2