diff --git a/ui-ngx/src/app/core/http/edge.service.ts b/ui-ngx/src/app/core/http/edge.service.ts
index 9c87f449fc..55313babde 100644
--- a/ui-ngx/src/app/core/http/edge.service.ts
+++ b/ui-ngx/src/app/core/http/edge.service.ts
@@ -104,4 +104,8 @@ export class EdgeService {
   public findMissingToRelatedRuleChains(edgeId: string, config?: RequestConfig): Observable<string> {
     return this.http.get<string>(`/api/edge/missingToRelatedRuleChains/${edgeId}`, defaultHttpOptionsFromConfig(config));
   }
+
+  public findByName(edgeName: string, config?: RequestConfig): Observable<Edge> {
+    return this.http.get<Edge>(`/api/tenant/edges?edgeName=${edgeName}`, defaultHttpOptionsFromConfig(config));
+  }
 }
diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts
index c9832b4cc3..cf760b95b8 100644
--- a/ui-ngx/src/app/core/http/entity.service.ts
+++ b/ui-ngx/src/app/core/http/entity.service.ts
@@ -70,6 +70,7 @@ import {
 import { alarmFields } from '@shared/models/alarm.models';
 import { EdgeService } from "@core/http/edge.service";
 import { ruleChainType } from "@shared/models/rule-chain.models";
+import { Edge } from '@shared/models/edge.models';
 
 @Injectable({
   providedIn: 'root'
@@ -888,6 +889,21 @@ export class EntityService {
         };
         saveEntityObservable = this.assetService.saveAsset(asset, config);
         break;
+      case EntityType.EDGE:
+        const edge: Edge = {
+          name: entityData.name,
+          type: entityData.type,
+          label: entityData.label,
+          additionalInfo: {
+            description: entityData.description
+          },
+          edgeLicenseKey: entityData.edgeLicenseKey,
+          cloudEndpoint: entityData.cloudEndpoint,
+          routingKey: entityData.routingKey,
+          secret: entityData.secret
+        }
+        saveEntityObservable = this.edgeService.saveEdge(edge, config);
+        break;
     }
     return saveEntityObservable.pipe(
       mergeMap((entity) => {
diff --git a/ui-ngx/src/app/modules/home/components/import-export/import-dialog-csv.component.ts b/ui-ngx/src/app/modules/home/components/import-export/import-dialog-csv.component.ts
index 7897d24feb..a3c913357d 100644
--- a/ui-ngx/src/app/modules/home/components/import-export/import-dialog-csv.component.ts
+++ b/ui-ngx/src/app/modules/home/components/import-export/import-dialog-csv.component.ts
@@ -203,7 +203,11 @@ export class ImportDialogCsvComponent extends DialogComponent<ImportDialogCsvCom
           server: [],
           shared: []
         },
-        timeseries: []
+        timeseries: [],
+        edgeLicenseKey: '',
+        cloudEndpoint: '',
+        routingKey: '',
+        secret: ''
       };
       const i = row;
       for (let j = 0; j < parameterColumns.length; j++) {
@@ -244,6 +248,18 @@ export class ImportDialogCsvComponent extends DialogComponent<ImportDialogCsvCom
           case ImportEntityColumnType.description:
             entityData.description = importData.rows[i][j];
             break;
+            case ImportEntityColumnType.edgeLicenseKey:
+            entityData.edgeLicenseKey = importData.rows[i][j];
+            break;
+            case ImportEntityColumnType.cloudEndpoint:
+            entityData.cloudEndpoint = importData.rows[i][j];
+            break;
+            case ImportEntityColumnType.routingKey:
+            entityData.routingKey = importData.rows[i][j];
+            break;
+            case ImportEntityColumnType.secret:
+            entityData.secret = importData.rows[i][j];
+            break;
         }
       }
       entitiesData.push(entityData);
diff --git a/ui-ngx/src/app/modules/home/components/import-export/import-export.models.ts b/ui-ngx/src/app/modules/home/components/import-export/import-export.models.ts
index cd37c43223..b1cb423678 100644
--- a/ui-ngx/src/app/modules/home/components/import-export/import-export.models.ts
+++ b/ui-ngx/src/app/modules/home/components/import-export/import-export.models.ts
@@ -49,7 +49,11 @@ export enum ImportEntityColumnType {
   entityField = 'ENTITY_FIELD',
   accessToken = 'ACCESS_TOKEN',
   isGateway = 'IS_GATEWAY',
-  description = 'DESCRIPTION'
+  description = 'DESCRIPTION',
+  edgeLicenseKey = 'EDGE_LICENSE_KEY',
+  cloudEndpoint = 'CLOUD_ENDPOINT',
+  routingKey = 'ROUTING_KEY',
+  secret = 'SECRET'
 }
 
 export const importEntityObjectColumns =
@@ -68,6 +72,10 @@ export const importEntityColumnTypeTranslations = new Map<ImportEntityColumnType
     [ImportEntityColumnType.accessToken, 'import.column-type.access-token'],
     [ImportEntityColumnType.isGateway, 'import.column-type.isgateway'],
     [ImportEntityColumnType.description, 'import.column-type.description'],
+    [ImportEntityColumnType.edgeLicenseKey, 'import.column-type.edgeLicenseKey'],
+    [ImportEntityColumnType.cloudEndpoint, 'import.column-type.cloudEndpoint'],
+    [ImportEntityColumnType.routingKey, 'import.column-type.routingKey'],
+    [ImportEntityColumnType.secret, 'import.column-type.secret']
   ]
 );
 
diff --git a/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.ts b/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.ts
index 3555efd1e3..5b6a6c0ef2 100644
--- a/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.ts
+++ b/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.ts
@@ -93,6 +93,14 @@ export class TableColumnsAssignmentComponent implements OnInit, ControlValueAcce
           { value: ImportEntityColumnType.timeseries }
         );
         break;
+      case EntityType.EDGE:
+        this.columnTypes.push(
+          { value: ImportEntityColumnType.edgeLicenseKey },
+          { value: ImportEntityColumnType.cloudEndpoint },
+          { value: ImportEntityColumnType.routingKey },
+          { value: ImportEntityColumnType.secret }
+        );
+        break;
     }
   }
 
diff --git a/ui-ngx/src/app/modules/home/dialogs/home-dialogs.service.ts b/ui-ngx/src/app/modules/home/dialogs/home-dialogs.service.ts
index e7524567b0..85fe49a997 100644
--- a/ui-ngx/src/app/modules/home/dialogs/home-dialogs.service.ts
+++ b/ui-ngx/src/app/modules/home/dialogs/home-dialogs.service.ts
@@ -36,6 +36,8 @@ export class HomeDialogsService {
         return this.openImportDialogCSV(entityType, 'device.import', 'device.device-file');
       case EntityType.ASSET:
         return this.openImportDialogCSV(entityType, 'asset.import', 'asset.asset-file');
+      case EntityType.EDGE:
+        return this.openImportDialogCSV(entityType, 'edge.import', 'edge.edge-file');
     }
   }
 
diff --git a/ui-ngx/src/app/shared/models/entity.models.ts b/ui-ngx/src/app/shared/models/entity.models.ts
index 8f1d4f417e..70267c9f6c 100644
--- a/ui-ngx/src/app/shared/models/entity.models.ts
+++ b/ui-ngx/src/app/shared/models/entity.models.ts
@@ -43,6 +43,10 @@ export interface ImportEntityData {
     shared: AttributeData[]
   };
   timeseries: AttributeData[];
+  secret: string;
+  routingKey: string;
+  cloudEndpoint: string;
+  edgeLicenseKey: string;
 }
 
 export interface ImportEntitiesResultInfo {