diff --git a/.github/workflows/oas-check.yml b/.github/workflows/oas-check.yml
index 9002e148..b88ad48a 100644
--- a/.github/workflows/oas-check.yml
+++ b/.github/workflows/oas-check.yml
@@ -2,16 +2,11 @@ name: check-oas
 
 on:
   push:
-    paths:
-      - "src/openklant/components/*/openapi.yaml"
-      - .github/workflows/oas-check.yml
-    branches:
-      - '**'
   workflow_dispatch:
 
 jobs:
   open-api-workflow-check-oas:
-    uses: maykinmedia/open-api-workflows/.github/workflows/oas-check.yml@v1
+    uses: maykinmedia/open-api-workflows/.github/workflows/oas-check.yml@v5.0.0
     strategy:
       matrix:
         component:
@@ -19,7 +14,7 @@ jobs:
           - klantinteracties
     with:
       schema-path: 'src/openklant/components/${{ matrix.component }}/openapi.yaml'
-      schema-command: 'spectacular_for_component'
-      schema-options: "--component ${{ matrix.component }}"
+      schema-command: 'bin/generate_schema_for_component.sh'
+      schema-options: "${{ matrix.component }} src/openklant/components/${{ matrix.component }}/openapi.yaml"
       python-version: '3.11'
       django-settings-module: 'openklant.conf.ci'
diff --git a/bin/generate_schema_for_component.sh b/bin/generate_schema_for_component.sh
index 0af2c5b7..ffa323ed 100755
--- a/bin/generate_schema_for_component.sh
+++ b/bin/generate_schema_for_component.sh
@@ -22,6 +22,8 @@ OUTPUT_FILE=$2
 echo "Generating OAS schema for $1..."
 src/manage.py spectacular_for_component \
     --file ${OUTPUT_FILE:-$SCHEMA_PATH/openapi.yaml} \
+    --lang="nl-nl" \
+    --validate \
     --component $1
 
 echo "Done."