diff --git a/ui-ngx/src/app/core/http/ai-model.service.ts b/ui-ngx/src/app/core/http/ai-model.service.ts
index b2f63ba583..64e003c30e 100644
--- a/ui-ngx/src/app/core/http/ai-model.service.ts
+++ b/ui-ngx/src/app/core/http/ai-model.service.ts
@@ -32,19 +32,19 @@ export class AiModelService {
   ) {}
 
   public saveAiModel(aiModel: AiModel, config?: RequestConfig): Observable<AiModel> {
-    return this.http.post<AiModel>('/api/ai/model/settings', aiModel, defaultHttpOptionsFromConfig(config));
+    return this.http.post<AiModel>('/api/ai/model', aiModel, defaultHttpOptionsFromConfig(config));
   }
 
   public getAiModels(pageLink: PageLink, config?: RequestConfig): Observable<PageData<AiModel>> {
-    return this.http.get<PageData<AiModel>>(`/api/ai/model/settings${pageLink.toQuery()}`, defaultHttpOptionsFromConfig(config));
+    return this.http.get<PageData<AiModel>>(`/api/ai/model${pageLink.toQuery()}`, defaultHttpOptionsFromConfig(config));
   }
 
   public getAiModelById(aiModelId: string, config?: RequestConfig): Observable<AiModel> {
-    return this.http.get<AiModel>(`/api/ai/model/settings/${aiModelId}`, defaultHttpOptionsFromConfig(config));
+    return this.http.get<AiModel>(`/api/ai/model/${aiModelId}`, defaultHttpOptionsFromConfig(config));
   }
 
   public deleteAiModel(aiModelId: string, config?: RequestConfig) {
-    return this.http.delete(`/api/ai/model/settings/${aiModelId}`, defaultHttpOptionsFromConfig(config));
+    return this.http.delete(`/api/ai/model/${aiModelId}`, defaultHttpOptionsFromConfig(config));
   }
 
   public checkConnectivity(aiModelWithUserMsg: AiModelWithUserMsg, config?: RequestConfig): Observable<CheckConnectivityResult> {
diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts
index 17a755ad30..ac6e4b7a7a 100644
--- a/ui-ngx/src/app/core/http/entity.service.ts
+++ b/ui-ngx/src/app/core/http/entity.service.ts
@@ -185,7 +185,7 @@ export class EntityService {
       case EntityType.MOBILE_APP_BUNDLE:
         observable = this.mobileAppService.getMobileAppBundleInfoById(entityId, config);
         break;
-      case EntityType.AI_MODEL_SETTINGS:
+      case EntityType.AI_MODEL:
         observable = this.aiModelService.getAiModelById(entityId, config);
         break;
     }
@@ -490,7 +490,7 @@ export class EntityService {
         pageLink.sortOrder.property = 'title';
         entitiesObservable = this.mobileAppService.getTenantMobileAppBundleInfos(pageLink, config);
         break;
-      case EntityType.AI_MODEL_SETTINGS:
+      case EntityType.AI_MODEL:
         pageLink.sortOrder.property = 'name';
         entitiesObservable = this.aiModelService.getAiModels(pageLink, config);
         break;
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html
index f085913d5c..8846858a8d 100644
--- a/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html
@@ -28,7 +28,7 @@
         appearance="outline"
         labelText="ai-models.ai-model"
         (entityChanged)="onEntityChange($event)"
-        [entityType]="entityType.AI_MODEL_SETTINGS"
+        [entityType]="entityType.AI_MODEL"
         (createNew)="createModelAi('modelSettingsId')"
         formControlName="modelSettingsId">
       </tb-entity-autocomplete>
diff --git a/ui-ngx/src/app/modules/home/pages/ai-model/ai-model-table-config.resolve.ts b/ui-ngx/src/app/modules/home/pages/ai-model/ai-model-table-config.resolve.ts
index 9f135d002c..6e9bde0b60 100644
--- a/ui-ngx/src/app/modules/home/pages/ai-model/ai-model-table-config.resolve.ts
+++ b/ui-ngx/src/app/modules/home/pages/ai-model/ai-model-table-config.resolve.ts
@@ -46,11 +46,11 @@ export class AiModelsTableConfigResolver {
     private dialog: MatDialog
   ) {
     this.config.selectionEnabled = true;
-    this.config.entityType = EntityType.AI_MODEL_SETTINGS;
+    this.config.entityType = EntityType.AI_MODEL;
     this.config.addAsTextButton = true;
     this.config.detailsPanelEnabled = false;
-    this.config.entityTranslations = entityTypeTranslations.get(EntityType.AI_MODEL_SETTINGS);
-    this.config.entityResources = entityTypeResources.get(EntityType.AI_MODEL_SETTINGS);
+    this.config.entityTranslations = entityTypeTranslations.get(EntityType.AI_MODEL);
+    this.config.entityResources = entityTypeResources.get(EntityType.AI_MODEL);
 
     this.config.headerComponent = AiModelTableHeaderComponent;
     this.config.addDialogStyle = {width: '850px', maxHeight: '100vh'};
@@ -65,7 +65,7 @@ export class AiModelsTableConfigResolver {
           entity => this.translate.instant(AiProviderTranslations.get(entity.configuration.provider))
       ),
       new EntityTableColumn<AiModel>('aiModel', 'ai-models.ai-model', '33%',
-          entity => entity.configuration.modelConfig.modelId, () => ({}), false
+          entity => entity.configuration.modelId, () => ({}), false
       )
     )
 
diff --git a/ui-ngx/src/app/shared/components/ai-model/ai-model-dialog.component.html b/ui-ngx/src/app/shared/components/ai-model/ai-model-dialog.component.html
index 1a8fae3b45..97eeb79f02 100644
--- a/ui-ngx/src/app/shared/components/ai-model/ai-model-dialog.component.html
+++ b/ui-ngx/src/app/shared/components/ai-model/ai-model-dialog.component.html
@@ -117,7 +117,7 @@
           </div>
         </section>
       </section>
-      <section class="tb-form-panel stroked" formGroupName="modelConfig">
+      <section class="tb-form-panel stroked">
         <div class="tb-form-panel-title" translate>ai-models.configuration</div>
         <section class="tb-form-panel no-border no-padding">
           <section class="tb-form-panel outlined no-border no-padding">
@@ -139,7 +139,7 @@
                         matTooltipPosition="above"
                         matTooltipClass="tb-error-tooltip"
                         [matTooltip]="'ai-models.temperature-min' | translate"
-                        *ngIf="aiModelForms.get('configuration').get('modelConfig').get('temperature').hasError('min')"
+                        *ngIf="aiModelForms.get('configuration').get('temperature').hasError('min')"
                         class="tb-error">
                 warning
               </mat-icon>
@@ -156,8 +156,8 @@
                         matTooltipPosition="above"
                         matTooltipClass="tb-error-tooltip"
                         [matTooltip]="'ai-models.top-p-min-max' | translate"
-                        *ngIf="aiModelForms.get('configuration').get('modelConfig').get('topP').hasError('min') ||
-                          aiModelForms.get('configuration').get('modelConfig').get('topP').hasError('max')"
+                        *ngIf="aiModelForms.get('configuration').get('topP').hasError('min') ||
+                          aiModelForms.get('configuration').get('topP').hasError('max')"
                         class="tb-error">
                 warning
               </mat-icon>
@@ -176,7 +176,7 @@
                           matTooltipPosition="above"
                           matTooltipClass="tb-error-tooltip"
                           [matTooltip]="'ai-models.top-k-min' | translate"
-                          *ngIf="aiModelForms.get('configuration').get('modelConfig').get('topK').hasError('min')"
+                          *ngIf="aiModelForms.get('configuration').get('topK').hasError('min')"
                           class="tb-error">
                   warning
                 </mat-icon>
@@ -216,7 +216,7 @@
                         matTooltipPosition="above"
                         matTooltipClass="tb-error-tooltip"
                         [matTooltip]="'ai-models.max-output-token-min' | translate"
-                        *ngIf="aiModelForms.get('configuration').get('modelConfig').get('maxOutputTokens').hasError('min')"
+                        *ngIf="aiModelForms.get('configuration').get('maxOutputTokens').hasError('min')"
                         class="tb-error">
                 warning
               </mat-icon>
diff --git a/ui-ngx/src/app/shared/components/ai-model/ai-model-dialog.component.ts b/ui-ngx/src/app/shared/components/ai-model/ai-model-dialog.component.ts
index 5dd63d3f5b..04087dcb79 100644
--- a/ui-ngx/src/app/shared/components/ai-model/ai-model-dialog.component.ts
+++ b/ui-ngx/src/app/shared/components/ai-model/ai-model-dialog.component.ts
@@ -91,15 +91,13 @@ export class AIModelDialogComponent extends DialogComponent<AIModelDialogCompone
           serviceAccountKey: [this.data.AIModel ? this.data.AIModel.configuration.providerConfig?.serviceAccountKey : '', [Validators.required]],
           serviceAccountKeyFileName: [this.data.AIModel ? this.data.AIModel.configuration.providerConfig?.serviceAccountKeyFileName : '', [Validators.required]],
         }),
-        modelConfig: this.fb.group({
-          modelId: [this.data.AIModel ? this.data.AIModel.configuration.modelConfig?.modelId : '', [Validators.required]],
-          temperature: [this.data.AIModel ? this.data.AIModel.configuration.modelConfig?.temperature : null, [Validators.min(0)]],
-          topP: this.data.AIModel ? this.data.AIModel.configuration.modelConfig?.topP : [null, [Validators.min(0.1), Validators.max(1)]],
-          topK: [this.data.AIModel ? this.data.AIModel.configuration.modelConfig?.topK : null, [Validators.min(0)]],
-          frequencyPenalty: [this.data.AIModel ? this.data.AIModel.configuration.modelConfig?.frequencyPenalty : null],
-          presencePenalty: [this.data.AIModel ? this.data.AIModel.configuration.modelConfig?.presencePenalty : null],
-          maxOutputTokens: [this.data.AIModel ? this.data.AIModel.configuration.modelConfig?.maxOutputTokens : null, [Validators.min(1)]]
-        })
+        modelId: [this.data.AIModel ? this.data.AIModel.configuration?.modelId : '', [Validators.required]],
+        temperature: [this.data.AIModel ? this.data.AIModel.configuration?.temperature : null, [Validators.min(0)]],
+        topP: this.data.AIModel ? this.data.AIModel.configuration?.topP : [null, [Validators.min(0.1), Validators.max(1)]],
+        topK: [this.data.AIModel ? this.data.AIModel.configuration?.topK : null, [Validators.min(0)]],
+        frequencyPenalty: [this.data.AIModel ? this.data.AIModel.configuration?.frequencyPenalty : null],
+        presencePenalty: [this.data.AIModel ? this.data.AIModel.configuration?.presencePenalty : null],
+        maxOutputTokens: [this.data.AIModel ? this.data.AIModel.configuration?.maxOutputTokens : null, [Validators.min(1)]]
       })
     });
 
@@ -107,7 +105,7 @@ export class AIModelDialogComponent extends DialogComponent<AIModelDialogCompone
       takeUntilDestroyed()
     ).subscribe((provider: AiProvider) => {
       this.provider = provider;
-      this.aiModelForms.get('configuration.modelConfig').reset({});
+      // this.aiModelForms.get('configuration').reset({});
       this.aiModelForms.get('configuration.providerConfig').reset({});
       this.updateValidation(provider);
     })
diff --git a/ui-ngx/src/app/shared/components/ai-model/check-connectivity-dialog.component.ts b/ui-ngx/src/app/shared/components/ai-model/check-connectivity-dialog.component.ts
index 70896cdc6d..e7f0d8c174 100644
--- a/ui-ngx/src/app/shared/components/ai-model/check-connectivity-dialog.component.ts
+++ b/ui-ngx/src/app/shared/components/ai-model/check-connectivity-dialog.component.ts
@@ -54,15 +54,13 @@ export class CheckConnectivityDialogComponent extends DialogComponent<CheckConne
             }
           ]
         },
-        chatModel: {
+        chatModelConfig: {
           modelType: "CHAT",
           provider: this.data.AIModel.configuration.provider,
           providerConfig: {...this.data.AIModel.configuration.providerConfig},
-          modelConfig: {
-            modelId: this.data.AIModel.configuration.modelConfig.modelId,
-            maxRetries: 0,
-            timeoutSeconds: 20
-          }
+          modelId: this.data.AIModel.configuration.modelId,
+          maxRetries: 0,
+          timeoutSeconds: 20
         }
       }
       this.aiModelService.checkConnectivity(aiModelWithMsg, {
diff --git a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
index 403502d56a..8cb785c6f1 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
@@ -291,7 +291,7 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
           this.entityRequiredText = 'notification.notification-recipient-required';
           this.notFoundEntities = 'notification.no-recipients-text';
           break;
-        case EntityType.AI_MODEL_SETTINGS:
+        case EntityType.AI_MODEL:
           this.entityText = 'ai-models.ai-model';
           this.noEntitiesMatchingText = 'ai-models.no-model-matching';
           this.entityRequiredText = 'ai-models.model-required';
diff --git a/ui-ngx/src/app/shared/models/ai-model.models.ts b/ui-ngx/src/app/shared/models/ai-model.models.ts
index 1f9c81bb1e..cd844f57e6 100644
--- a/ui-ngx/src/app/shared/models/ai-model.models.ts
+++ b/ui-ngx/src/app/shared/models/ai-model.models.ts
@@ -32,15 +32,13 @@ export interface AiModel extends Omit<BaseData<AiModelId>, 'label'>, HasTenantId
       serviceAccountKey?: string;
       serviceAccountKeyFileName?: string
     };
-    modelConfig: {
-      modelId: string;
-      temperature?: number | null;
-      topP?: number;
-      topK?: number;
-      frequencyPenalty?: number;
-      presencePenalty?: number;
-      maxOutputTokens?: number;
-    }
+    modelId: string;
+    temperature?: number | null;
+    topP?: number;
+    topK?: number;
+    frequencyPenalty?: number;
+    presencePenalty?: number;
+    maxOutputTokens?: number;
   }
 }
 
@@ -131,7 +129,7 @@ export interface AiModelWithUserMsg {
   userMessage: {
     contents: Array<{contentType: string; text: string}>;
   }
-  chatModel: {
+  chatModelConfig: {
     modelType: string;
     provider: AiProvider
     providerConfig: {
@@ -144,11 +142,11 @@ export interface AiModelWithUserMsg {
       serviceAccountKey?: string;
       serviceAccountKeyFileName?: string
     };
-    modelConfig: {
+    // chatModelConfig: {
       modelId: string;
       maxRetries: number;
       timeoutSeconds: number;
-    }
+    // }
   }
 }
 
diff --git a/ui-ngx/src/app/shared/models/entity-type.models.ts b/ui-ngx/src/app/shared/models/entity-type.models.ts
index 3b9e5f5427..6e7ba24578 100644
--- a/ui-ngx/src/app/shared/models/entity-type.models.ts
+++ b/ui-ngx/src/app/shared/models/entity-type.models.ts
@@ -51,7 +51,7 @@ export enum EntityType {
   MOBILE_APP_BUNDLE = 'MOBILE_APP_BUNDLE',
   MOBILE_APP = 'MOBILE_APP',
   CALCULATED_FIELD = 'CALCULATED_FIELD',
-  AI_MODEL_SETTINGS = 'AI_MODEL_SETTINGS',
+  AI_MODEL = 'AI_MODEL',
 }
 
 export enum AliasEntityType {
@@ -496,7 +496,7 @@ export const entityTypeTranslations = new Map<EntityType | AliasEntityType, Enti
       }
     ],
     [
-      EntityType.AI_MODEL_SETTINGS,
+      EntityType.AI_MODEL,
       {
         type: 'entity.type-ai-model',
         typePlural: 'entity.type-ai-models',
@@ -640,7 +640,7 @@ export const entityTypeResources = new Map<EntityType, EntityTypeResource<BaseDa
       }
     ],
     [
-      EntityType.AI_MODEL_SETTINGS,
+      EntityType.AI_MODEL,
       {
         helpLinkId: 'aiModels'
       }
diff --git a/ui-ngx/src/app/shared/models/id/ai-model-id.ts b/ui-ngx/src/app/shared/models/id/ai-model-id.ts
index d60d599133..9d6e114a5e 100644
--- a/ui-ngx/src/app/shared/models/id/ai-model-id.ts
+++ b/ui-ngx/src/app/shared/models/id/ai-model-id.ts
@@ -18,7 +18,7 @@ import { EntityId } from '@shared/models/id/entity-id';
 import { EntityType } from '@shared/models/entity-type.models';
 
 export class AiModelId implements EntityId {
-  entityType = EntityType.AI_MODEL_SETTINGS;
+  entityType = EntityType.AI_MODEL;
   id: string;
 
   constructor(id: string) {
diff --git a/ui-ngx/src/app/shared/models/vc.models.ts b/ui-ngx/src/app/shared/models/vc.models.ts
index 3623083285..9a4a68e005 100644
--- a/ui-ngx/src/app/shared/models/vc.models.ts
+++ b/ui-ngx/src/app/shared/models/vc.models.ts
@@ -37,7 +37,7 @@ export const exportableEntityTypes: Array<EntityType> = [
   EntityType.NOTIFICATION_TEMPLATE,
   EntityType.NOTIFICATION_TARGET,
   EntityType.NOTIFICATION_RULE,
-  EntityType.AI_MODEL_SETTINGS,
+  EntityType.AI_MODEL,
 ];
 
 export const entityTypesWithoutRelatedData = new Set<EntityType | AliasEntityType>([
@@ -46,7 +46,7 @@ export const entityTypesWithoutRelatedData = new Set<EntityType | AliasEntityTyp
   EntityType.NOTIFICATION_RULE,
   EntityType.TB_RESOURCE,
   EntityType.OTA_PACKAGE,
-  EntityType.AI_MODEL_SETTINGS,
+  EntityType.AI_MODEL,
 ]);
 
 export interface VersionCreateConfig {