diff --git a/src/app/cartography/models/node.ts b/src/app/cartography/models/node.ts
index e60f7202..c0f50a80 100644
--- a/src/app/cartography/models/node.ts
+++ b/src/app/cartography/models/node.ts
@@ -55,6 +55,7 @@ export class Properties {
   environment: string;
   extra_hosts: string;
   replicate_network_connection_state: boolean;
+  memory: number;
 }
 
 export class Node {
diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html
index 296cee21..f14d8962 100644
--- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html
+++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html
@@ -10,9 +10,19 @@
                             <mat-form-field class="form-field">
                                 <input matInput formControlName="name" type="text" [(ngModel)]="node.name" placeholder="Name">
                             </mat-form-field>
+
                             <mat-form-field class="form-field">
                                 <input formControlName="adapter" matInput type="number" [(ngModel)]="node.properties.adapters" placeholder="Adapters">
                             </mat-form-field>
+
+                            <mat-form-field class="form-field">
+                                <input formControlName="memory" matInput type="number" [(ngModel)]="node.properties.memory" placeholder="Maximum memory">
+                            </mat-form-field>
+
+                            <mat-form-field class="form-field">
+                                <input formControlName="cpus" matInput type="number" [(ngModel)]="node.properties.cpus" placeholder="Maximum CPUs">
+                            </mat-form-field>
+
                             <mat-form-field class="select">
                                 <mat-select [ngModelOptions]="{standalone: true}" placeholder="Console type" [(ngModel)]="node.console_type">
                                     <mat-option *ngFor="let type of consoleTypes" [value]="type">
diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts
index b855e85f..54c7d070 100644
--- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts
@@ -29,7 +29,9 @@ export class ConfiguratorDialogDockerComponent implements OnInit {
     ) {
         this.generalSettingsForm = this.formBuilder.group({
             name: new FormControl('', Validators.required),
-            adapter: new FormControl('', Validators.required)
+            adapter: new FormControl('', Validators.required),
+            memory: new FormControl(''),
+            cpus: new FormControl('')
         });
     }
 
@@ -38,12 +40,11 @@ export class ConfiguratorDialogDockerComponent implements OnInit {
             this.node = node;
             this.name = node.name;
             this.getConfiguration();
-        })
+        });
     }
 
     getConfiguration() {
         this.consoleTypes = this.dockerConfigurationService.getConsoleTypes();
-
     }
 
     onSaveClick() {