diff --git a/.github/workflows/behat-mariadb.yml b/.github/workflows/behat-mariadb.yml
index 3b18db5448..877ac006f2 100644
--- a/.github/workflows/behat-mariadb.yml
+++ b/.github/workflows/behat-mariadb.yml
@@ -124,13 +124,10 @@ jobs:
       - name: Set up dependencies
         working-directory: apps/${{ env.APP_NAME }}
         run: |
+          composer remove nextcloud/ocp --dev --no-scripts
           composer install --no-dev
           composer --working-dir=tests/integration install
 
-      - name: Prevent Nextcloud OCP outdated
-        working-directory: apps/${{ env.APP_NAME }}
-        run: make updateocp
-
       - name: Set up Nextcloud
         env:
           DB_PORT: 4444
diff --git a/.github/workflows/behat-mysql.yml b/.github/workflows/behat-mysql.yml
index 18f52a860d..443866f0a6 100644
--- a/.github/workflows/behat-mysql.yml
+++ b/.github/workflows/behat-mysql.yml
@@ -136,13 +136,10 @@ jobs:
         if: steps.check_composer.outputs.files_exists == 'true'
         working-directory: apps/${{ env.APP_NAME }}
         run: |
+          composer remove nextcloud/ocp --dev --no-scripts
           composer install --no-dev
           composer --working-dir=tests/integration install
 
-      - name: Prevent Nextcloud OCP outdated
-        working-directory: apps/${{ env.APP_NAME }}
-        run: make updateocp
-
       - name: Set up Nextcloud
         env:
           DB_PORT: 4444
diff --git a/.github/workflows/behat-pgsql.yml b/.github/workflows/behat-pgsql.yml
index 76f62a95ff..be01829801 100644
--- a/.github/workflows/behat-pgsql.yml
+++ b/.github/workflows/behat-pgsql.yml
@@ -130,13 +130,10 @@ jobs:
         if: steps.check_composer.outputs.files_exists == 'true'
         working-directory: apps/${{ env.APP_NAME }}
         run: |
+          composer remove nextcloud/ocp --dev --no-scripts
           composer install --no-dev
           composer --working-dir=tests/integration install
 
-      - name: Prevent Nextcloud OCP outdated
-        working-directory: apps/${{ env.APP_NAME }}
-        run: make updateocp
-
       - name: Set up Nextcloud
         env:
           DB_PORT: 4444
diff --git a/.github/workflows/behat-sqlite.yml b/.github/workflows/behat-sqlite.yml
index c9141a97b7..f8a0dff201 100644
--- a/.github/workflows/behat-sqlite.yml
+++ b/.github/workflows/behat-sqlite.yml
@@ -121,13 +121,10 @@ jobs:
         if: steps.check_composer.outputs.files_exists == 'true'
         working-directory: apps/${{ env.APP_NAME }}
         run: |
+          composer remove nextcloud/ocp --dev --no-scripts
           composer install --no-dev
           composer --working-dir=tests/integration install
 
-      - name: Prevent Nextcloud OCP outdated
-        working-directory: apps/${{ env.APP_NAME }}
-        run: make updateocp
-
       - name: Set up Nextcloud
         env:
           DB_PORT: 4444