diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.html b/src/app/components/template/template-list-dialog/template-list-dialog.component.html
index 2a59f3a3..4ef68e4a 100644
--- a/src/app/components/template/template-list-dialog/template-list-dialog.component.html
+++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.html
@@ -49,7 +49,7 @@
   <mat-select 
     *ngIf="selectedTemplate"
     placeholder="Choose server for node" 
-    [(ngModel)]="selectedTemplate.compute_id">
+    [(value)]="selectedTemplate.compute_id">
       <mat-option *ngFor="let type of nodeServers" [value]="type">
           {{type}}
       </mat-option>
diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.ts b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts
index 3642162b..311d3e77 100644
--- a/src/app/components/template/template-list-dialog/template-list-dialog.component.ts
+++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts
@@ -28,7 +28,7 @@ export class TemplateListDialogComponent implements OnInit {
   selectedTemplate: Template;
   searchText: string = '';
 
-  nodeServers: string[] = ['local', 'vm']
+  nodeServers: string[] = ['local', 'vm'];
 
   constructor(
     public dialogRef: MatDialogRef<TemplateListDialogComponent>,
@@ -70,6 +70,9 @@ export class TemplateListDialogComponent implements OnInit {
 
   chooseTemplate(event) {
     this.selectedTemplate = event.value;
+    if (this.selectedTemplate.template_type === 'cloud' || this.selectedTemplate.template_type === 'ethernet_hub' || this.selectedTemplate.template_type === 'ethernet_switch') {
+      this.selectedTemplate.compute_id = 'local';
+    }
     // this.configurationForm.controls['name'].setValue(this.selectedTemplate.default_name_format);
   }