diff --git a/src/app/node-data/vsphere-add-node/vsphere-node-data.component.html b/src/app/node-data/vsphere-add-node/vsphere-node-data.component.html
index e657591339..e99286f18d 100644
--- a/src/app/node-data/vsphere-add-node/vsphere-node-data.component.html
+++ b/src/app/node-data/vsphere-add-node/vsphere-node-data.component.html
@@ -1,7 +1,15 @@
-<form [formGroup]="vsphereNodeForm" fxLayout="column">
-  <div fxFlex class="mat-select-container">
-    <mat-form-field fxFlex>
-      <input matInput formControlName="cpu" min="1" max="8" type="number" placeholder="Number of CPUs*:" autocomplete="off">
+<form [formGroup]="vsphereNodeForm"
+      fxLayout="column">
+  <div fxFlex
+       class="mat-select-container">
+    <mat-form-field>
+      <input matInput
+             formControlName="cpu"
+             min="1"
+             max="8"
+             type="number"
+             placeholder="Number of CPUs*:"
+             autocomplete="off">
       <mat-error *ngIf="vsphereNodeForm.controls.cpu.hasError('required')">
         Number of CPUs is <strong>required</strong>
       </mat-error>
@@ -12,8 +20,13 @@
         Number of CPUs have to be at least 1
       </mat-error>
     </mat-form-field>
-    <mat-form-field fxFlex>
-      <input matInput formControlName="memory" min="512" type="number" placeholder="Memory in MB*:" autocomplete="off">
+    <mat-form-field>
+      <input matInput
+             formControlName="memory"
+             min="512"
+             type="number"
+             placeholder="Memory in MB*:"
+             autocomplete="off">
     </mat-form-field>
   </div>
 </form>
diff --git a/src/app/shared/entity/NodeEntity.ts b/src/app/shared/entity/NodeEntity.ts
index 3b29de1dea..7232597cc8 100644
--- a/src/app/shared/entity/NodeEntity.ts
+++ b/src/app/shared/entity/NodeEntity.ts
@@ -83,7 +83,7 @@ export function getEmptyNodeProviderSpec(provider: string): object {
   switch (provider) {
     case NodeProvider.AWS:
       const awsSpec: AWSNodeSpec = {
-        instanceType: 't2.small',
+        instanceType: 't3.small',
         diskSize: 25,
         volumeType: 'standard',
         ami: '',
diff --git a/src/app/testing/fake-data/node.fake.ts b/src/app/testing/fake-data/node.fake.ts
index a79eaca0fe..e8b0eb1109 100644
--- a/src/app/testing/fake-data/node.fake.ts
+++ b/src/app/testing/fake-data/node.fake.ts
@@ -310,7 +310,7 @@ export function nodeDataFake(): NodeData {
           tags: [],
         },
         aws: {
-          instanceType: 't2.small',
+          instanceType: 't3.small',
           diskSize: 25,
           volumeType: 'standard',
           ami: '',
@@ -364,7 +364,7 @@ export function nodeDataCentOsFake(): NodeData {
           tags: [],
         },
         aws: {
-          instanceType: 't2.small',
+          instanceType: 't3.small',
           diskSize: 25,
           volumeType: 'standard',
           ami: '',
@@ -418,7 +418,7 @@ export function nodeDataContainerLinuxFake(): NodeData {
           tags: [],
         },
         aws: {
-          instanceType: 't2.small',
+          instanceType: 't3.small',
           diskSize: 25,
           volumeType: 'standard',
           ami: '',