diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a4011394..dab405a2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
       - name: "🔎 Run validator"
         run: |
-          npx @redocly/cli@latest lint data/api/*/*.yaml
+          npx @redocly/cli@2.31.5 lint data/api/*/*.yaml
 
   check-event-examples:
     name: "🔎 Check Event schema examples"
diff --git a/changelogs/client_server/newsfragments/2386.clarification b/changelogs/client_server/newsfragments/2386.clarification
new file mode 100644
index 00000000..71db80bb
--- /dev/null
+++ b/changelogs/client_server/newsfragments/2386.clarification
@@ -0,0 +1 @@
+Removed unused components in OpenAPI definitions.
diff --git a/data/api/client-server/login.yaml b/data/api/client-server/login.yaml
index 21726a3d..cadf812c 100644
--- a/data/api/client-server/login.yaml
+++ b/data/api/client-server/login.yaml
@@ -313,9 +313,3 @@ servers:
         default: localhost:8008
       basePath:
         default: /_matrix/client/v3
-components:
-  securitySchemes:
-    accessTokenQuery:
-      $ref: definitions/security.yaml#/accessTokenQuery
-    accessTokenBearer:
-      $ref: definitions/security.yaml#/accessTokenBearer
diff --git a/data/api/client-server/registration.yaml b/data/api/client-server/registration.yaml
index 1315472f..baf4212a 100644
--- a/data/api/client-server/registration.yaml
+++ b/data/api/client-server/registration.yaml
@@ -480,9 +480,3 @@ servers:
         default: localhost:8008
       basePath:
         default: /_matrix/client/v3
-components:
-  securitySchemes:
-    accessTokenQuery:
-      $ref: definitions/security.yaml#/accessTokenQuery
-    accessTokenBearer:
-      $ref: definitions/security.yaml#/accessTokenBearer
diff --git a/data/api/client-server/room_summary.yaml b/data/api/client-server/room_summary.yaml
index e8ee3c8e..aa541275 100644
--- a/data/api/client-server/room_summary.yaml
+++ b/data/api/client-server/room_summary.yaml
@@ -130,9 +130,3 @@ servers:
         default: localhost:8008
       basePath:
         default: /_matrix/client/v1
-components:
-  securitySchemes:
-    accessTokenQuery:
-      $ref: definitions/security.yaml#/accessTokenQuery
-    accessTokenBearer:
-      $ref: definitions/security.yaml#/accessTokenBearer