diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
index 3c5c8774d5..1540a3c87f 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
@@ -275,6 +275,34 @@
         </mat-error>
         <mat-hint></mat-hint>
       </mat-form-field>
+      <mat-form-field class="mat-block flex-1" appearance="fill" subscriptSizing="dynamic">
+        <mat-label translate>tenant-profile.max-related-level-per-argument</mat-label>
+        <input matInput required min="1" step="1"
+               formControlName="maxRelationLevelPerCfArgument"
+               type="number">
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRelationLevelPerCfArgument').hasError('required')">
+          {{ 'tenant-profile.max-related-level-per-argument-required' | translate}}
+        </mat-error>
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRelationLevelPerCfArgument').hasError('min')">
+          {{ 'tenant-profile.max-related-level-per-argument-range' | translate}}
+        </mat-error>
+        <mat-hint></mat-hint>
+      </mat-form-field>
+    </div>
+    <div class="flex flex-1 flex-row xs:flex-col gt-xs:gap-4">
+      <mat-form-field class="mat-block flex-1" appearance="fill" subscriptSizing="dynamic">
+        <mat-label translate>tenant-profile.min-allowed-scheduled-update-interval</mat-label>
+        <input matInput required min="0" step="1"
+               formControlName="minAllowedScheduledUpdateIntervalInSecForCF"
+               type="number">
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('minAllowedScheduledUpdateIntervalInSecForCF').hasError('required')">
+          {{ 'tenant-profile.min-allowed-scheduled-update-interval-required' | translate}}
+        </mat-error>
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('minAllowedScheduledUpdateIntervalInSecForCF').hasError('min')">
+          {{ 'tenant-profile.min-allowed-scheduled-update-interval-range' | translate}}
+        </mat-error>
+        <mat-hint></mat-hint>
+      </mat-form-field>
       <div class="flex-1"></div>
     </div>
     <mat-expansion-panel class="configuration-panel">
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
index c6efd9dee3..0dd1453648 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
@@ -124,6 +124,8 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
       edgeUplinkMessagesRateLimitsPerEdge: [null, []],
       maxCalculatedFieldsPerEntity: [null, [Validators.required, Validators.min(0)]],
       maxArgumentsPerCF: [null, [Validators.required, Validators.min(0)]],
+      maxRelationLevelPerCfArgument: [null, [Validators.required, Validators.min(1)]],
+      minAllowedScheduledUpdateIntervalInSecForCF: [null, [Validators.required, Validators.min(0)]],
       maxDataPointsPerRollingArg: [null, [Validators.required, Validators.min(0)]],
       maxStateSizeInKBytes: [null, [Validators.required, Validators.min(0)]],
       calculatedFieldDebugEventsRateLimit: [null, []],
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index d0844ad85e..07c995bf19 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -5779,6 +5779,12 @@
         "max-arguments-per-cf": "Arguments per calculated field max number",
         "max-arguments-per-cf-range": "Arguments per calculated field max number can't be negative",
         "max-arguments-per-cf-required": "Arguments per calculated field max number is required",
+        "max-related-level-per-argument": "Maximum relation level per 'Related entities' argument",
+        "max-related-level-per-argument-range": "Relation level per 'Related entities' argument max number can't be less than '1'",
+        "max-related-level-per-argument-required": "Relation level per 'Related entities' argument max number is required",
+        "min-allowed-scheduled-update-interval": "Min allowed update interval for 'Related entities' arguments (seconds)",
+        "min-allowed-scheduled-update-interval-range": "Min allowed update interval min number can't be negative",
+        "min-allowed-scheduled-update-interval-required": "Min allowed update interval min number is required",
         "max-state-size": "State maximum size in KB",
         "max-state-size-range": "State maximum size in KB can't be negative",
         "max-state-size-required": "State maximum size in KB is required",