diff --git a/plugins/catalog-backend/src/schema/openapi.yaml b/plugins/catalog-backend/src/schema/openapi.yaml
index a13990f021..d0266e4d46 100644
--- a/plugins/catalog-backend/src/schema/openapi.yaml
+++ b/plugins/catalog-backend/src/schema/openapi.yaml
@@ -25,6 +25,9 @@ info:
     name: Apache-2.0
     url: http://www.apache.org/licenses/LICENSE-2.0.html
   contact: {}
+tags:
+  - name: Entity
+  - name: Locations
 servers:
   - url: /
 components:
@@ -1270,6 +1273,7 @@ paths:
         - in: query
           name: onConflict
           required: false
+          allowReserved: true
           schema:
             type: string
             enum:
diff --git a/plugins/catalog-backend/src/schema/openapi/generated/router.ts b/plugins/catalog-backend/src/schema/openapi/generated/router.ts
index c1ba9c7cf3..6b92c7ae63 100644
--- a/plugins/catalog-backend/src/schema/openapi/generated/router.ts
+++ b/plugins/catalog-backend/src/schema/openapi/generated/router.ts
@@ -33,6 +33,14 @@ export const spec = {
     },
     contact: {},
   },
+  tags: [
+    {
+      name: 'Entity',
+    },
+    {
+      name: 'Locations',
+    },
+  ],
   servers: [
     {
       url: '/',
@@ -1494,6 +1502,7 @@ export const spec = {
             in: 'query',
             name: 'onConflict',
             required: false,
+            allowReserved: true,
             schema: {
               type: 'string',
               enum: ['refresh', 'reject'],