diff --git a/.run/[CE Edge] Install.run.xml b/.run/[CE Edge] Install.run.xml
index 5950318ef8..ecc4c081a5 100644
--- a/.run/[CE Edge] Install.run.xml	
+++ b/.run/[CE Edge] Install.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="[CE Edge] Install" type="Application" factoryName="Application">
     <envs>
-      <env name="SPRING_DATASOURCE_URL" value="jdbc:postgresql://localhost:5432/tb_ce_edge_3" />
+      <env name="SPRING_DATASOURCE_URL" value="jdbc:postgresql://localhost:5432/tb_ce_3" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.thingsboard.server.ThingsboardInstallApplication" />
     <module name="application" />
diff --git a/.run/[CE Edge] Server.run.xml b/.run/[CE Edge] Server.run.xml
index 018c0e705a..67edc48d1f 100644
--- a/.run/[CE Edge] Server.run.xml	
+++ b/.run/[CE Edge] Server.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="[CE Edge] Server" type="Application" factoryName="Application">
     <envs>
-      <env name="SPRING_DATASOURCE_URL" value="jdbc:postgresql://localhost:5432/tb_ce_edge_3" />
+      <env name="SPRING_DATASOURCE_URL" value="jdbc:postgresql://localhost:5432/tb_ce_3" />
       <env name="EDGES_RPC_PORT" value="7070" />
       <env name="COAP_ENABLED" value="true" />
       <env name="EDGES_RPC_ENABLED" value="true" />
diff --git a/ui-ngx/src/app/core/http/edge.service.ts b/ui-ngx/src/app/core/http/edge.service.ts
index 588fbe6d64..5beef00ff2 100644
--- a/ui-ngx/src/app/core/http/edge.service.ts
+++ b/ui-ngx/src/app/core/http/edge.service.ts
@@ -14,15 +14,14 @@
 /// limitations under the License.
 ///
 
-import { Injectable } from '@angular/core';
+import {Inject, Injectable} from '@angular/core';
 import { defaultHttpOptionsFromConfig, RequestConfig } from './http-utils';
 import { Observable } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
 import { PageLink } from '@shared/models/page/page-link';
 import { PageData } from '@shared/models/page/page-data';
 import { EntitySubtype } from '@app/shared/models/entity-type.models';
-import {Edge, EdgeInfo, EdgeSearchQuery } from "@shared/models/edge.models";
-
+import { Edge, EdgeInfo, EdgeSearchQuery } from "@shared/models/edge.models";
 @Injectable({
   providedIn: 'root'
 })
diff --git a/ui-ngx/src/app/modules/home/pages/edge/edge.component.html b/ui-ngx/src/app/modules/home/pages/edge/edge.component.html
index ed85648a8f..9a501d31f0 100644
--- a/ui-ngx/src/app/modules/home/pages/edge/edge.component.html
+++ b/ui-ngx/src/app/modules/home/pages/edge/edge.component.html
@@ -88,6 +88,28 @@
         </mat-form-field>
       </div>
     </fieldset>
+      <div fxLayout="row">
+        <fieldset fxFlex>
+          <mat-form-field class="mat-block">
+            <mat-label translate>edge.cloud-endpoint</mat-label>
+            <input matInput formControlName="cloudEndpoint" required>
+            <mat-error *ngIf="entityForm.get('cloudEndpoint').hasError('required')">
+              {{ 'edge.cloud-endpoint-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+        </fieldset>
+      </div>
+      <div fxLayout="row">
+        <fieldset fxFlex>
+          <mat-form-field class="mat-block">
+            <mat-label translate>edge.edge-license-key</mat-label>
+            <input matInput formControlName="edgeLicenseKey" required>
+            <mat-error *ngIf="entityForm.get('edgeLicenseKey').hasError('required')">
+              {{ 'edge.edge-license-key-required' | translate }}
+            </mat-error>
+          </mat-form-field>
+        </fieldset>
+      </div>
       <div fxLayout="row">
         <fieldset fxFlex disabled>
           <mat-form-field class="mat-block">
diff --git a/ui-ngx/src/app/modules/home/pages/edge/edge.component.ts b/ui-ngx/src/app/modules/home/pages/edge/edge.component.ts
index de4327d232..af39cd4ed9 100644
--- a/ui-ngx/src/app/modules/home/pages/edge/edge.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/edge/edge.component.ts
@@ -48,7 +48,7 @@ export class EdgeComponent extends EntityComponent<EdgeInfo>{
 
   ngOnInit() {
     this.edgeScope = this.entitiesTableConfig.componentsData.edgeScope;
-    super.ngOnInit()
+    super.ngOnInit();
   }
 
   hideDelete() {
@@ -69,6 +69,8 @@ export class EdgeComponent extends EntityComponent<EdgeInfo>{
         name: [entity ? entity.name : '', [Validators.required]],
         type: [entity ? entity.type : null, [Validators.required]],
         label: [entity ? entity.label : ''],
+        cloudEndpoint: '',
+        edgeLicenseKey: '',
         routingKey: guid(),
         secret: this.generateSecret(20),
         additionalInfo: this.fb.group(
@@ -84,6 +86,8 @@ export class EdgeComponent extends EntityComponent<EdgeInfo>{
     this.entityForm.patchValue({name: entity.name});
     this.entityForm.patchValue({type: entity.type});
     this.entityForm.patchValue({label: entity.label});
+    this.entityForm.patchValue({cloudEndpoint: entity.cloudEndpoint});
+    this.entityForm.patchValue({edgeLicenseKey: entity.edgeLicenseKey});
     this.entityForm.patchValue({routingKey: entity.routingKey});
     this.entityForm.patchValue({secret: entity.secret});
     this.entityForm.patchValue({additionalInfo: {
diff --git a/ui-ngx/src/app/shared/models/edge.models.ts b/ui-ngx/src/app/shared/models/edge.models.ts
index b7ab7d29a8..45eacb74fb 100644
--- a/ui-ngx/src/app/shared/models/edge.models.ts
+++ b/ui-ngx/src/app/shared/models/edge.models.ts
@@ -27,6 +27,8 @@ export interface Edge extends BaseData<EdgeId> {
   type: string;
   secret: string;
   routingKey: string;
+  cloudEndpoint: string;
+  edgeLicenseKey: string;
   label?: string;
   additionalInfo?: any;
 }
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 f5eea5ad11..23a0120490 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -916,15 +916,24 @@
       "delete-edges-text": "Be careful, after the confirmation all selected edges will be removed and all related data will become unrecoverable.",
       "name": "Name",
       "name-required": "Name is required.",
+      "edge-license-key": "Edge License Key",
+      "edge-license-key-required": "Edge License Key is required.",
+      "cloud-endpoint": "Cloud Endpoint",
+      "cloud-endpoint-required": "Cloud Endpoint is required.",
       "description": "Description",
-      "events": "Events",
+      "entity-info": "Entity info",
       "details": "Details",
+      "events": "Events",
       "copy-id": "Copy Edge Id",
       "id-copied-message": "Edge Id has been copied to clipboard",
+      "sync": "Sync Edge",
+      "sync-message": "Edge has been synchronized",
       "permissions": "Permissions",
       "edge-required": "Edge required",
       "edge-type": "Edge type",
       "edge-type-required": "Edge type is required.",
+      "event-action": "Event action",
+      "entity-id": "Entity ID",
       "select-edge-type": "Select edge type",
       "assign-to-customer": "Assign to customer",
       "assign-to-customer-text": "Please select the customer to assign the edge(s)",
@@ -935,6 +944,8 @@
       "assign-edges-text": "Assign { count, plural, 1 {1 edge} other {# edges} } to customer",
       "unassign-edge-title": "Are you sure you want to unassign the edge '{{edgeName}}'?",
       "unassign-edge-text": "After the confirmation the edge will be unassigned and won't be accessible by the customer.",
+      "unassign-edges-title": "Are you sure you want to unassign { count, plural, 1 {1 edge} other {# edges} }?",
+      "unassign-edges-text": "After the confirmation all selected edges will be unassigned and won't be accessible by the customer.",
       "make-public": "Make edge public",
       "make-public-edge-title": "Are you sure you want to make the edge '{{edgeName}}' public?",
       "make-public-edge-text": "After the confirmation the edge and all its data will be made public and accessible by others.",
@@ -944,6 +955,7 @@
       "make-private-edge-text": "After the confirmation the edge and all its data will be made private and won't be accessible by others.",
       "import": "Import edge",
       "label": "Label",
+      "load-entity-error": "Entity not found. Failed to load info",
       "assign-new-edge": "Assign new edge",
       "manage-edge-dashboards": "Manage edge dashboards",
       "unassign-from-edge": "Unassign from edge",
@@ -966,9 +978,9 @@
       "set-root-rule-chain-text": "Please select root rule chain for edge(s)",
       "set-root-rule-chain-to-edges": "Set root rule chain for Edge(s)",
       "set-root-rule-chain-to-edges-text": "Set root rule chain for { count, plural, 1 {1 edge} other {# edges} }",
-      "selected-edges": "{ count, plural, 1 {1 edge} other {# edges} } selected",
-      "name-starts-with": "Edge name starts with",
-      "search": "Search edges"
+      "status": "Received by edge",
+      "success": "Deployed",
+      "failed": "Pending"
     },
     "error": {
         "unable-to-connect": "Unable to connect to the server! Please check your internet connection.",