diff --git a/src/lib/openapi/spec/client-metrics-env-schema.ts b/src/lib/openapi/spec/client-metrics-env-schema.ts
index 7f75291978..75955882ed 100644
--- a/src/lib/openapi/spec/client-metrics-env-schema.ts
+++ b/src/lib/openapi/spec/client-metrics-env-schema.ts
@@ -5,7 +5,6 @@ export const clientMetricsEnvSchema = {
     $id: '#/components/schemas/clientMetricsEnvSchema',
     type: 'object',
     required: ['featureName', 'appName', 'environment'],
-    additionalProperties: true,
     description: 'Used for reporting feature evaluation results from SDKs',
     properties: {
         featureName: {
diff --git a/src/lib/openapi/spec/create-application-schema.ts b/src/lib/openapi/spec/create-application-schema.ts
index c6e99d4c16..fa270be268 100644
--- a/src/lib/openapi/spec/create-application-schema.ts
+++ b/src/lib/openapi/spec/create-application-schema.ts
@@ -3,7 +3,6 @@ import { FromSchema } from 'json-schema-to-ts';
 export const createApplicationSchema = {
     $id: '#/components/schemas/createApplicationSchema',
     type: 'object',
-    additionalProperties: true,
     description: 'Reported application information from Unleash SDKs',
     properties: {
         appName: {
diff --git a/src/lib/openapi/spec/create-group-schema.ts b/src/lib/openapi/spec/create-group-schema.ts
index 3b7da90fd9..113314c8d8 100644
--- a/src/lib/openapi/spec/create-group-schema.ts
+++ b/src/lib/openapi/spec/create-group-schema.ts
@@ -4,7 +4,6 @@ import { groupSchema } from './group-schema';
 export const createGroupSchema = {
     $id: '#/components/schemas/createGroupSchema',
     type: 'object',
-    additionalProperties: true,
     required: ['name'],
     description: 'A detailed information about a user group',
     properties: {
diff --git a/src/lib/openapi/spec/create-strategy-variant-schema.ts b/src/lib/openapi/spec/create-strategy-variant-schema.ts
index e777317b1c..ec8532f9a7 100644
--- a/src/lib/openapi/spec/create-strategy-variant-schema.ts
+++ b/src/lib/openapi/spec/create-strategy-variant-schema.ts
@@ -3,7 +3,6 @@ import { FromSchema } from 'json-schema-to-ts';
 export const createStrategyVariantSchema = {
     $id: '#/components/schemas/createStrategyVariantSchema',
     type: 'object',
-    additionalProperties: true,
     description:
         "This is an experimental property. It may change or be removed as we work on it. Please don't depend on it yet. A strategy variant allows you to attach any data to strategies instead of only returning `true`/`false`. Strategy variants take precedence over feature variants.",
     required: ['name', 'weight', 'weightType', 'stickiness'],
diff --git a/src/lib/openapi/spec/event-schema.ts b/src/lib/openapi/spec/event-schema.ts
index 00a37c63a7..fa11b61602 100644
--- a/src/lib/openapi/spec/event-schema.ts
+++ b/src/lib/openapi/spec/event-schema.ts
@@ -7,7 +7,6 @@ const eventDataSchema = {
     type: 'object',
     nullable: true,
     'x-enforcer-exception-skip-codes': 'WSCH006', // allow additional properties in example (openapi enforcer)
-    additionalProperties: true,
     description:
         'Extra associated data related to the event, such as feature toggle state, segment configuration, etc., if applicable.',
     example: {
diff --git a/src/lib/openapi/spec/export-query-schema.ts b/src/lib/openapi/spec/export-query-schema.ts
index fab0cee34a..a234762fb2 100644
--- a/src/lib/openapi/spec/export-query-schema.ts
+++ b/src/lib/openapi/spec/export-query-schema.ts
@@ -3,7 +3,6 @@ import { FromSchema } from 'json-schema-to-ts';
 export const exportQuerySchema = {
     $id: '#/components/schemas/exportQuerySchema',
     type: 'object',
-    additionalProperties: true,
     required: ['environment'],
     description:
         'Available query parameters for  the [deprecated export/import](https://docs.getunleash.io/reference/deploy/import-export) functionality.',
diff --git a/src/lib/openapi/spec/sdk-context-schema.ts b/src/lib/openapi/spec/sdk-context-schema.ts
index 8a0b5f4f42..3260280d6d 100644
--- a/src/lib/openapi/spec/sdk-context-schema.ts
+++ b/src/lib/openapi/spec/sdk-context-schema.ts
@@ -4,7 +4,6 @@ export const sdkContextSchema = {
     $id: '#/components/schemas/sdkContextSchema',
     description: 'The Unleash context as modeled in client SDKs',
     type: 'object',
-    additionalProperties: true,
     required: ['appName'],
     properties: {
         appName: {
diff --git a/src/lib/openapi/spec/state-schema.ts b/src/lib/openapi/spec/state-schema.ts
index fc23eba9ef..dc9bc8284f 100644
--- a/src/lib/openapi/spec/state-schema.ts
+++ b/src/lib/openapi/spec/state-schema.ts
@@ -15,7 +15,6 @@ import { strategyVariantSchema } from './strategy-variant-schema';
 export const stateSchema = {
     $id: '#/components/schemas/stateSchema',
     type: 'object',
-    additionalProperties: true,
     deprecated: true,
     description:
         'The application state as used by the deprecated export/import APIs.',
diff --git a/src/lib/openapi/spec/token-string-list-schema.ts b/src/lib/openapi/spec/token-string-list-schema.ts
index 752d32e4c7..846fcc119c 100644
--- a/src/lib/openapi/spec/token-string-list-schema.ts
+++ b/src/lib/openapi/spec/token-string-list-schema.ts
@@ -3,7 +3,6 @@ import { FromSchema } from 'json-schema-to-ts';
 export const tokenStringListSchema = {
     $id: '#/components/schemas/tokenStringListSchema',
     type: 'object',
-    additionalProperties: true,
     description: 'A list of unleash tokens to validate against known tokens',
     required: ['tokens'],
     properties: {
diff --git a/src/lib/openapi/spec/update-user-schema.ts b/src/lib/openapi/spec/update-user-schema.ts
index 070326dd19..64b7764c51 100644
--- a/src/lib/openapi/spec/update-user-schema.ts
+++ b/src/lib/openapi/spec/update-user-schema.ts
@@ -3,7 +3,6 @@ import { FromSchema } from 'json-schema-to-ts';
 export const updateUserSchema = {
     $id: '#/components/schemas/updateUserSchema',
     type: 'object',
-    additionalProperties: true,
     description: 'All fields that can be directly changed for the user',
     properties: {
         email: {