diff --git a/creodias/.gitignore b/creodias/.gitignore
new file mode 100644
index 00000000..99f42989
--- /dev/null
+++ b/creodias/.gitignore
@@ -0,0 +1 @@
+debug-*.log
\ No newline at end of file
diff --git a/creodias/.terraform/modules/modules.json b/creodias/.terraform/modules/modules.json
index 559a16a9..c1526a53 100644
--- a/creodias/.terraform/modules/modules.json
+++ b/creodias/.terraform/modules/modules.json
@@ -1 +1 @@
-{"Modules":[{"Key":"compute","Source":"./modules/compute","Dir":"modules/compute"},{"Key":"ips","Source":"./modules/ips","Dir":"modules/ips"},{"Key":"loadbalancer","Source":"./modules/loadbalancer","Dir":"modules/loadbalancer"},{"Key":"network","Source":"./modules/network","Dir":"modules/network"},{"Key":"","Source":"","Dir":"."}]}
\ No newline at end of file
+{"Modules":[{"Key":"network","Source":"./modules/network","Dir":"modules/network"},{"Key":"","Source":"","Dir":"."},{"Key":"compute","Source":"./modules/compute","Dir":"modules/compute"},{"Key":"ips","Source":"./modules/ips","Dir":"modules/ips"},{"Key":"loadbalancer","Source":"./modules/loadbalancer","Dir":"modules/loadbalancer"}]}
\ No newline at end of file
diff --git a/creodias/deployCREODIAS.sh b/creodias/deployCREODIAS.sh
index db3756aa..f18f93cf 100755
--- a/creodias/deployCREODIAS.sh
+++ b/creodias/deployCREODIAS.sh
@@ -23,9 +23,12 @@ then
 fi
 
 # terraform
+export TF_LOG=DEBUG
 terraform init
 #
 # keypair first
+export TF_LOG_PATH="$PWD/debug-keypair.log"
+rm "${TF_LOG_PATH}"
 terraform ${ACTION} ${AUTO_APPROVE} -var-file=eoepca.tfvars -target=module.compute.openstack_compute_keypair_v2.k8s
 if test "$ACTION" = "apply"
 then
@@ -42,5 +45,7 @@ then
 fi
 #
 # after keypair - everything else
+export TF_LOG_PATH="$PWD/debug-deployment.log"
+rm "${TF_LOG_PATH}"
 echo "Proceeding with deployment..."
 terraform ${ACTION} ${AUTO_APPROVE} -var-file=eoepca.tfvars
diff --git a/creodias/eoepca.tf b/creodias/eoepca.tf
index 805d24a7..d8736045 100644
--- a/creodias/eoepca.tf
+++ b/creodias/eoepca.tf
@@ -41,6 +41,7 @@ module "compute" {
   number_of_k8s_nodes                          = "${var.number_of_k8s_nodes}"
   number_of_bastions                           = "${var.number_of_bastions}"
   number_of_k8s_nodes_no_floating_ip           = "${var.number_of_k8s_nodes_no_floating_ip}"
+  number_of_k8s_nodes_hm                       = "${var.number_of_k8s_nodes_hm}"
   number_of_gfs_nodes_no_floating_ip           = "${var.number_of_gfs_nodes_no_floating_ip}"
   bastion_root_volume_size_in_gb               = "${var.bastion_root_volume_size_in_gb}"
   etcd_root_volume_size_in_gb                  = "${var.etcd_root_volume_size_in_gb}"
@@ -83,6 +84,7 @@ module "loadbalancer" {
   cluster_name    = "${var.cluster_name}"
   network_id      = "${module.network.network_id}"
   k8s_node_ips    = "${module.compute.k8s_node_ips}"
+  k8s_node_hm_ips    = "${module.compute.k8s_node_hm_ips}"
   floatingip_pool = "${var.floatingip_pool}"
   k8s_secgroup_id = "${module.compute.k8s_secgroup_id}"
   use_neutron     = "${var.use_neutron}"
@@ -128,6 +130,10 @@ output "k8s_node_ips" {
   value = "${module.compute.k8s_node_ips}"
 }
 
+output "k8s_node_hm_ips" {
+  value = "${module.compute.k8s_node_hm_ips}"
+}
+
 output "nfs_ip_address" {
   value = "${module.compute.nfs_ip_address}"
 }
diff --git a/creodias/eoepca.tfvars b/creodias/eoepca.tfvars
index 4111faac..5cf085d2 100644
--- a/creodias/eoepca.tfvars
+++ b/creodias/eoepca.tfvars
@@ -28,7 +28,8 @@ number_of_k8s_masters_no_floating_ip_no_etcd = 0
 
 # nodes
 number_of_k8s_nodes = 0
-number_of_k8s_nodes_no_floating_ip = 6
+number_of_k8s_nodes_no_floating_ip = 0
+number_of_k8s_nodes_hm = 3
 
 #-------------------------------------------------------------------------------
 # Compute
diff --git a/creodias/modules/compute/main.tf b/creodias/modules/compute/main.tf
index fffe3b3b..4788e186 100644
--- a/creodias/modules/compute/main.tf
+++ b/creodias/modules/compute/main.tf
@@ -677,6 +677,65 @@ resource "openstack_compute_instance_v2" "k8s_node_no_floating_ip" {
   }
 }
 
+resource "openstack_compute_instance_v2" "k8s_node_high_memory" {
+  name              = "${var.cluster_name}-k8s-node-hm-${count.index + 1}"
+  count             = "${var.node_root_volume_size_in_gb == 0 ? var.number_of_k8s_nodes_hm : 0}"
+  availability_zone = "${element(var.az_list, count.index)}"
+  image_name        = "${var.image}"
+  flavor_id         = "25"
+  key_pair          = "${openstack_compute_keypair_v2.k8s.name}"
+
+  lifecycle {
+     ignore_changes = [image_name]
+  }
+
+  network {
+    name = "${var.network_name}"
+  }
+
+  network {
+    name = "${var.eodata_network_name}"
+  }
+
+  security_groups = ["${openstack_networking_secgroup_v2.k8s.name}",
+    "${openstack_networking_secgroup_v2.worker.name}",
+  ]
+
+  dynamic "scheduler_hints" {
+    for_each = var.use_server_groups ? [openstack_compute_servergroup_v2.k8s_node[0]] : []
+    content {
+      group = "${openstack_compute_servergroup_v2.k8s_node[0].id}"
+    }
+  }
+
+  metadata = {
+    ssh_user         = "${var.ssh_user}"
+    kubespray_groups = "kube-node,k8s-cluster,no-floating,${var.supplementary_node_groups}"
+    depends_on       = "${var.network_id}"
+    use_access_ip    = "${var.use_access_ip}"
+  }
+
+  connection {
+    type         = "ssh"
+    user         = "${var.ssh_user}"
+    private_key  = "${chomp(file(trimsuffix(var.public_key_path, ".pub")))}"
+    host         = "${self.access_ip_v4}"
+    bastion_host = var.bastion_fips[0]
+  }
+
+  provisioner "file" {
+    source      = "${path.module}/rke-node-setup.sh"
+    destination = "/tmp/rke-node-setup.sh"
+  }
+
+  provisioner "remote-exec" {
+    inline = [
+      "sudo chmod +x /tmp/rke-node-setup.sh",
+      "sudo /tmp/rke-node-setup.sh ${var.ssh_user}",
+    ]
+  }
+}
+
 resource "openstack_compute_instance_v2" "k8s_node_no_floating_ip_custom_volume_size" {
   name              = "${var.cluster_name}-k8s-node-nf-${count.index + 1}"
   count             = "${var.node_root_volume_size_in_gb > 0 ? var.number_of_k8s_nodes_no_floating_ip : 0}"
diff --git a/creodias/modules/compute/outputs.tf b/creodias/modules/compute/outputs.tf
index 5c665c25..0582e6c8 100644
--- a/creodias/modules/compute/outputs.tf
+++ b/creodias/modules/compute/outputs.tf
@@ -6,6 +6,10 @@ output "k8s_node_ips" {
   value = "${openstack_compute_instance_v2.k8s_node_no_floating_ip.*.access_ip_v4}"
 }
 
+output "k8s_node_hm_ips" {
+  value = "${openstack_compute_instance_v2.k8s_node_high_memory.*.access_ip_v4}"
+}
+
 output "k8s_secgroup_id" {
   value = "${openstack_networking_secgroup_v2.k8s.id}"
 }
diff --git a/creodias/modules/compute/variables.tf b/creodias/modules/compute/variables.tf
index bf49ae78..8fb06332 100644
--- a/creodias/modules/compute/variables.tf
+++ b/creodias/modules/compute/variables.tf
@@ -18,6 +18,8 @@ variable "number_of_k8s_nodes" {}
 
 variable "number_of_k8s_nodes_no_floating_ip" {}
 
+variable "number_of_k8s_nodes_hm" {}
+
 variable "number_of_bastions" {}
 
 variable "number_of_gfs_nodes_no_floating_ip" {}
diff --git a/creodias/modules/loadbalancer/main.tf b/creodias/modules/loadbalancer/main.tf
index c0107d16..30c25360 100644
--- a/creodias/modules/loadbalancer/main.tf
+++ b/creodias/modules/loadbalancer/main.tf
@@ -103,6 +103,14 @@ resource "openstack_lb_members_v2" "https" {
       protocol_port = 31443
     }
   }
+
+  dynamic "member" {
+    for_each = var.k8s_node_hm_ips
+    content {
+      address = member.value
+      protocol_port = 31443
+    }
+  }
 }
 
 resource "openstack_lb_members_v2" "http" {
@@ -116,6 +124,14 @@ resource "openstack_lb_members_v2" "http" {
       protocol_port = 31080
     }
   }
+
+  dynamic "member" {
+    for_each = var.k8s_node_hm_ips
+    content {
+      address = member.value
+      protocol_port = 31080
+    }
+  }
 }
 
 # resource "openstack_lb_monitor_v2" "https_ping" {
diff --git a/creodias/modules/loadbalancer/variables.tf b/creodias/modules/loadbalancer/variables.tf
index e69973eb..a3e27630 100644
--- a/creodias/modules/loadbalancer/variables.tf
+++ b/creodias/modules/loadbalancer/variables.tf
@@ -4,6 +4,10 @@ variable "k8s_node_ips" {
   type = list
 }
 
+variable "k8s_node_hm_ips" {
+  type = list
+}
+
 variable "network_id" {}
 
 variable "floatingip_pool" {}
diff --git a/creodias/terraform.tfstate b/creodias/terraform.tfstate
index 37108818..bbdbdd52 100644
--- a/creodias/terraform.tfstate
+++ b/creodias/terraform.tfstate
@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "0.12.29",
-  "serial": 295,
+  "serial": 331,
   "lineage": "470e9021-37b9-9f2e-189c-3508fd25c4bd",
   "outputs": {
     "bastion_fips": {
@@ -44,27 +44,28 @@
         []
       ]
     },
-    "k8s_node_ips": {
+    "k8s_node_hm_ips": {
       "value": [
-        "192.168.100.3",
-        "192.168.100.17",
-        "192.168.100.9",
-        "192.168.100.7",
-        "192.168.100.12",
-        "192.168.100.16"
+        "192.168.100.22",
+        "192.168.100.20",
+        "192.168.100.18"
       ],
       "type": [
         "tuple",
         [
-          "string",
-          "string",
-          "string",
           "string",
           "string",
           "string"
         ]
       ]
     },
+    "k8s_node_ips": {
+      "value": [],
+      "type": [
+        "tuple",
+        []
+      ]
+    },
     "loadbalancer_fips": {
       "value": [
         "185.52.195.19"
@@ -128,7 +129,7 @@
             "sort_key": "name",
             "tag": null,
             "tags": [],
-            "updated_at": "2023-04-06T14:06:01Z",
+            "updated_at": "2023-09-28T01:40:27Z",
             "visibility": "public"
           }
         }
@@ -168,7 +169,7 @@
             "sort_key": "name",
             "tag": null,
             "tags": [],
-            "updated_at": "2023-04-06T14:06:01Z",
+            "updated_at": "2023-09-28T01:40:27Z",
             "visibility": "public"
           }
         }
@@ -721,7 +722,7 @@
       "module": "module.compute",
       "mode": "managed",
       "type": "openstack_compute_instance_v2",
-      "name": "k8s_node_no_floating_ip",
+      "name": "k8s_node_high_memory",
       "each": "list",
       "provider": "provider.openstack",
       "instances": [
@@ -729,7 +730,7 @@
           "index_key": 0,
           "schema_version": 0,
           "attributes": {
-            "access_ip_v4": "192.168.100.3",
+            "access_ip_v4": "192.168.100.22",
             "access_ip_v6": "",
             "admin_pass": null,
             "all_metadata": {
@@ -743,11 +744,11 @@
             "availability_zone_hints": null,
             "block_device": [],
             "config_drive": null,
-            "flavor_id": "21",
-            "flavor_name": "eo2.xlarge",
+            "flavor_id": "25",
+            "flavor_name": "hm.xlarge",
             "floating_ip": null,
             "force_delete": false,
-            "id": "8cee93a4-7f21-4538-9432-a7944b663e14",
+            "id": "40d42b6c-eeb0-475a-aead-74bef4f7aa34",
             "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
             "image_name": "Ubuntu 18.04 LTS",
             "key_pair": "kubernetes-demo",
@@ -757,24 +758,24 @@
               "ssh_user": "eouser",
               "use_access_ip": "1"
             },
-            "name": "demo-k8s-node-nf-1",
+            "name": "demo-k8s-node-hm-1",
             "network": [
               {
                 "access_network": false,
-                "fixed_ip_v4": "192.168.100.3",
+                "fixed_ip_v4": "192.168.100.22",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:40:53:ac",
+                "mac": "fa:16:3e:20:05:e9",
                 "name": "demo",
                 "port": "",
                 "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
               },
               {
                 "access_network": false,
-                "fixed_ip_v4": "10.111.0.115",
+                "fixed_ip_v4": "10.111.0.111",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:86:9b:2f",
+                "mac": "fa:16:3e:af:4b:26",
                 "name": "eodata",
                 "port": "",
                 "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
@@ -810,7 +811,7 @@
           "index_key": 1,
           "schema_version": 0,
           "attributes": {
-            "access_ip_v4": "192.168.100.17",
+            "access_ip_v4": "192.168.100.20",
             "access_ip_v6": "",
             "admin_pass": null,
             "all_metadata": {
@@ -824,11 +825,11 @@
             "availability_zone_hints": null,
             "block_device": [],
             "config_drive": null,
-            "flavor_id": "21",
-            "flavor_name": "eo2.xlarge",
+            "flavor_id": "25",
+            "flavor_name": "hm.xlarge",
             "floating_ip": null,
             "force_delete": false,
-            "id": "00d56072-1db8-4513-9ad4-957888a125b3",
+            "id": "c6b3a278-1d67-4f6b-8faa-96c341c2e993",
             "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
             "image_name": "Ubuntu 18.04 LTS",
             "key_pair": "kubernetes-demo",
@@ -838,24 +839,24 @@
               "ssh_user": "eouser",
               "use_access_ip": "1"
             },
-            "name": "demo-k8s-node-nf-2",
+            "name": "demo-k8s-node-hm-2",
             "network": [
               {
                 "access_network": false,
-                "fixed_ip_v4": "192.168.100.17",
+                "fixed_ip_v4": "192.168.100.20",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:2c:ed:72",
+                "mac": "fa:16:3e:26:d6:97",
                 "name": "demo",
                 "port": "",
                 "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
               },
               {
                 "access_network": false,
-                "fixed_ip_v4": "10.111.1.121",
+                "fixed_ip_v4": "10.111.0.116",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:5e:54:00",
+                "mac": "fa:16:3e:70:34:91",
                 "name": "eodata",
                 "port": "",
                 "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
@@ -891,250 +892,7 @@
           "index_key": 2,
           "schema_version": 0,
           "attributes": {
-            "access_ip_v4": "192.168.100.9",
-            "access_ip_v6": "",
-            "admin_pass": null,
-            "all_metadata": {
-              "depends_on": "7bc63c72-3d8a-424c-aa66-e000e36eedd5",
-              "kubespray_groups": "kube-node,k8s-cluster,no-floating,",
-              "ssh_user": "eouser",
-              "use_access_ip": "1"
-            },
-            "all_tags": [],
-            "availability_zone": "nova",
-            "availability_zone_hints": null,
-            "block_device": [],
-            "config_drive": null,
-            "flavor_id": "21",
-            "flavor_name": "eo2.xlarge",
-            "floating_ip": null,
-            "force_delete": false,
-            "id": "67b12004-bb39-4453-9903-4c1545b333c3",
-            "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
-            "image_name": "Ubuntu 18.04 LTS",
-            "key_pair": "kubernetes-demo",
-            "metadata": {
-              "depends_on": "7bc63c72-3d8a-424c-aa66-e000e36eedd5",
-              "kubespray_groups": "kube-node,k8s-cluster,no-floating,",
-              "ssh_user": "eouser",
-              "use_access_ip": "1"
-            },
-            "name": "demo-k8s-node-nf-3",
-            "network": [
-              {
-                "access_network": false,
-                "fixed_ip_v4": "192.168.100.9",
-                "fixed_ip_v6": "",
-                "floating_ip": "",
-                "mac": "fa:16:3e:19:84:6a",
-                "name": "demo",
-                "port": "",
-                "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
-              },
-              {
-                "access_network": false,
-                "fixed_ip_v4": "10.111.0.50",
-                "fixed_ip_v6": "",
-                "floating_ip": "",
-                "mac": "fa:16:3e:5a:dc:88",
-                "name": "eodata",
-                "port": "",
-                "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
-              }
-            ],
-            "network_mode": null,
-            "personality": [],
-            "power_state": "active",
-            "region": "RegionOne",
-            "scheduler_hints": [],
-            "security_groups": [
-              "demo-k8s",
-              "demo-k8s-worker"
-            ],
-            "stop_before_destroy": false,
-            "tags": [],
-            "timeouts": null,
-            "user_data": null,
-            "vendor_options": [],
-            "volume": []
-          },
-          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19",
-          "dependencies": [
-            "module.compute.openstack_compute_keypair_v2.k8s",
-            "module.compute.openstack_compute_servergroup_v2.k8s_node",
-            "module.compute.openstack_networking_secgroup_v2.k8s",
-            "module.compute.openstack_networking_secgroup_v2.worker",
-            "module.ips.openstack_networking_floatingip_v2.bastion",
-            "module.network.openstack_networking_router_v2.k8s"
-          ]
-        },
-        {
-          "index_key": 3,
-          "schema_version": 0,
-          "attributes": {
-            "access_ip_v4": "192.168.100.7",
-            "access_ip_v6": "",
-            "admin_pass": null,
-            "all_metadata": {
-              "depends_on": "7bc63c72-3d8a-424c-aa66-e000e36eedd5",
-              "kubespray_groups": "kube-node,k8s-cluster,no-floating,",
-              "ssh_user": "eouser",
-              "use_access_ip": "1"
-            },
-            "all_tags": [],
-            "availability_zone": "nova",
-            "availability_zone_hints": null,
-            "block_device": [],
-            "config_drive": null,
-            "flavor_id": "21",
-            "flavor_name": "eo2.xlarge",
-            "floating_ip": null,
-            "force_delete": false,
-            "id": "49b22ff5-1e94-4853-b190-5899f1e67888",
-            "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
-            "image_name": "Ubuntu 18.04 LTS",
-            "key_pair": "kubernetes-demo",
-            "metadata": {
-              "depends_on": "7bc63c72-3d8a-424c-aa66-e000e36eedd5",
-              "kubespray_groups": "kube-node,k8s-cluster,no-floating,",
-              "ssh_user": "eouser",
-              "use_access_ip": "1"
-            },
-            "name": "demo-k8s-node-nf-4",
-            "network": [
-              {
-                "access_network": false,
-                "fixed_ip_v4": "192.168.100.7",
-                "fixed_ip_v6": "",
-                "floating_ip": "",
-                "mac": "fa:16:3e:cd:35:a8",
-                "name": "demo",
-                "port": "",
-                "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
-              },
-              {
-                "access_network": false,
-                "fixed_ip_v4": "10.111.2.66",
-                "fixed_ip_v6": "",
-                "floating_ip": "",
-                "mac": "fa:16:3e:1c:a5:f7",
-                "name": "eodata",
-                "port": "",
-                "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
-              }
-            ],
-            "network_mode": null,
-            "personality": [],
-            "power_state": "active",
-            "region": "RegionOne",
-            "scheduler_hints": [],
-            "security_groups": [
-              "demo-k8s",
-              "demo-k8s-worker"
-            ],
-            "stop_before_destroy": false,
-            "tags": [],
-            "timeouts": null,
-            "user_data": null,
-            "vendor_options": [],
-            "volume": []
-          },
-          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19",
-          "dependencies": [
-            "module.compute.openstack_compute_keypair_v2.k8s",
-            "module.compute.openstack_compute_servergroup_v2.k8s_node",
-            "module.compute.openstack_networking_secgroup_v2.k8s",
-            "module.compute.openstack_networking_secgroup_v2.worker",
-            "module.ips.openstack_networking_floatingip_v2.bastion",
-            "module.network.openstack_networking_router_v2.k8s"
-          ]
-        },
-        {
-          "index_key": 4,
-          "schema_version": 0,
-          "attributes": {
-            "access_ip_v4": "192.168.100.12",
-            "access_ip_v6": "",
-            "admin_pass": null,
-            "all_metadata": {
-              "depends_on": "7bc63c72-3d8a-424c-aa66-e000e36eedd5",
-              "kubespray_groups": "kube-node,k8s-cluster,no-floating,",
-              "ssh_user": "eouser",
-              "use_access_ip": "1"
-            },
-            "all_tags": [],
-            "availability_zone": "nova",
-            "availability_zone_hints": null,
-            "block_device": [],
-            "config_drive": null,
-            "flavor_id": "21",
-            "flavor_name": "eo2.xlarge",
-            "floating_ip": null,
-            "force_delete": false,
-            "id": "59ac4bac-c957-428d-be9e-33322f9764fd",
-            "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
-            "image_name": "Ubuntu 18.04 LTS",
-            "key_pair": "kubernetes-demo",
-            "metadata": {
-              "depends_on": "7bc63c72-3d8a-424c-aa66-e000e36eedd5",
-              "kubespray_groups": "kube-node,k8s-cluster,no-floating,",
-              "ssh_user": "eouser",
-              "use_access_ip": "1"
-            },
-            "name": "demo-k8s-node-nf-5",
-            "network": [
-              {
-                "access_network": false,
-                "fixed_ip_v4": "192.168.100.12",
-                "fixed_ip_v6": "",
-                "floating_ip": "",
-                "mac": "fa:16:3e:ca:c4:42",
-                "name": "demo",
-                "port": "",
-                "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
-              },
-              {
-                "access_network": false,
-                "fixed_ip_v4": "10.111.0.107",
-                "fixed_ip_v6": "",
-                "floating_ip": "",
-                "mac": "fa:16:3e:d5:2e:38",
-                "name": "eodata",
-                "port": "",
-                "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
-              }
-            ],
-            "network_mode": null,
-            "personality": [],
-            "power_state": "active",
-            "region": "RegionOne",
-            "scheduler_hints": [],
-            "security_groups": [
-              "demo-k8s",
-              "demo-k8s-worker"
-            ],
-            "stop_before_destroy": false,
-            "tags": [],
-            "timeouts": null,
-            "user_data": null,
-            "vendor_options": [],
-            "volume": []
-          },
-          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19",
-          "dependencies": [
-            "module.compute.openstack_compute_keypair_v2.k8s",
-            "module.compute.openstack_compute_servergroup_v2.k8s_node",
-            "module.compute.openstack_networking_secgroup_v2.k8s",
-            "module.compute.openstack_networking_secgroup_v2.worker",
-            "module.ips.openstack_networking_floatingip_v2.bastion",
-            "module.network.openstack_networking_router_v2.k8s"
-          ]
-        },
-        {
-          "index_key": 5,
-          "schema_version": 0,
-          "attributes": {
-            "access_ip_v4": "192.168.100.16",
+            "access_ip_v4": "192.168.100.18",
             "access_ip_v6": "",
             "admin_pass": null,
             "all_metadata": {
@@ -1148,11 +906,11 @@
             "availability_zone_hints": null,
             "block_device": [],
             "config_drive": null,
-            "flavor_id": "21",
-            "flavor_name": "eo2.xlarge",
+            "flavor_id": "25",
+            "flavor_name": "hm.xlarge",
             "floating_ip": null,
             "force_delete": false,
-            "id": "75cc49dd-a411-4155-86e7-14a3773dd3dd",
+            "id": "4a1107a0-513e-4f9b-b0cc-a28fe8c41e5e",
             "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
             "image_name": "Ubuntu 18.04 LTS",
             "key_pair": "kubernetes-demo",
@@ -1162,24 +920,24 @@
               "ssh_user": "eouser",
               "use_access_ip": "1"
             },
-            "name": "demo-k8s-node-nf-6",
+            "name": "demo-k8s-node-hm-3",
             "network": [
               {
                 "access_network": false,
-                "fixed_ip_v4": "192.168.100.16",
+                "fixed_ip_v4": "192.168.100.18",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:29:f1:ee",
+                "mac": "fa:16:3e:10:55:d6",
                 "name": "demo",
                 "port": "",
                 "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
               },
               {
                 "access_network": false,
-                "fixed_ip_v4": "10.111.1.164",
+                "fixed_ip_v4": "10.111.0.51",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:51:f2:0d",
+                "mac": "fa:16:3e:ab:c5:35",
                 "name": "eodata",
                 "port": "",
                 "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
@@ -1213,6 +971,15 @@
         }
       ]
     },
+    {
+      "module": "module.compute",
+      "mode": "managed",
+      "type": "openstack_compute_instance_v2",
+      "name": "k8s_node_no_floating_ip",
+      "each": "list",
+      "provider": "provider.openstack",
+      "instances": []
+    },
     {
       "module": "module.compute",
       "mode": "managed",
@@ -1460,57 +1227,30 @@
             "id": "d9e0511f-701e-490e-88ed-a3e6f343e81f",
             "member": [
               {
-                "address": "192.168.100.12",
+                "address": "192.168.100.18",
                 "admin_state_up": true,
-                "id": "964b9085-473e-41a7-a6de-dcfc08ad2d63",
-                "name": "",
+                "id": "4affd870-eb73-4dc4-b03d-b4c9bdab5150",
+                "name": null,
                 "protocol_port": 31080,
-                "subnet_id": "",
+                "subnet_id": null,
                 "weight": 1
               },
               {
-                "address": "192.168.100.16",
+                "address": "192.168.100.20",
                 "admin_state_up": true,
-                "id": "dd468e1b-9b34-4a75-a97f-020d1432effd",
-                "name": "",
+                "id": "e697907f-b285-4d6f-88a4-0943ab4b67bf",
+                "name": null,
                 "protocol_port": 31080,
-                "subnet_id": "",
+                "subnet_id": null,
                 "weight": 1
               },
               {
-                "address": "192.168.100.17",
+                "address": "192.168.100.22",
                 "admin_state_up": true,
-                "id": "f1cbfa8a-ab13-4c4c-85ed-6350f296dcd4",
-                "name": "",
+                "id": "dc57a0da-2d89-410e-9524-13dac871b194",
+                "name": null,
                 "protocol_port": 31080,
-                "subnet_id": "",
-                "weight": 1
-              },
-              {
-                "address": "192.168.100.3",
-                "admin_state_up": true,
-                "id": "528d4c77-9816-4645-ae91-154938dfac40",
-                "name": "",
-                "protocol_port": 31080,
-                "subnet_id": "",
-                "weight": 1
-              },
-              {
-                "address": "192.168.100.7",
-                "admin_state_up": true,
-                "id": "aa7d3609-2d9b-4a26-a0e4-63ae81cee84a",
-                "name": "",
-                "protocol_port": 31080,
-                "subnet_id": "",
-                "weight": 1
-              },
-              {
-                "address": "192.168.100.9",
-                "admin_state_up": true,
-                "id": "f33d4574-4c81-4f66-aab4-2a23bbd0e725",
-                "name": "",
-                "protocol_port": 31080,
-                "subnet_id": "",
+                "subnet_id": null,
                 "weight": 1
               }
             ],
@@ -1520,6 +1260,7 @@
           },
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19",
           "dependencies": [
+            "module.compute.openstack_compute_instance_v2.k8s_node_high_memory",
             "module.compute.openstack_compute_instance_v2.k8s_node_no_floating_ip",
             "module.loadbalancer.openstack_lb_pool_v2.http"
           ]
@@ -1541,57 +1282,30 @@
             "id": "72d7473a-e169-473c-8a86-c177e474a01b",
             "member": [
               {
-                "address": "192.168.100.12",
-                "admin_state_up": true,
-                "id": "bfc90d51-622b-4f85-b265-5a770f5c7d63",
-                "name": "",
-                "protocol_port": 31443,
-                "subnet_id": "",
-                "weight": 1
-              },
-              {
-                "address": "192.168.100.16",
-                "admin_state_up": true,
-                "id": "2c0ef083-28a9-4288-96d2-c697ff6fd142",
-                "name": "",
-                "protocol_port": 31443,
-                "subnet_id": "",
-                "weight": 1
-              },
-              {
-                "address": "192.168.100.17",
-                "admin_state_up": true,
-                "id": "854800bf-54eb-4183-81b6-dd0fa37c6abc",
-                "name": "",
-                "protocol_port": 31443,
-                "subnet_id": "",
-                "weight": 1
-              },
-              {
-                "address": "192.168.100.3",
+                "address": "192.168.100.18",
                 "admin_state_up": true,
-                "id": "969ecc91-3bd8-42fe-bbc4-7838a6081982",
-                "name": "",
+                "id": "2f0330ed-9289-440a-9d78-8a3388606bb5",
+                "name": null,
                 "protocol_port": 31443,
-                "subnet_id": "",
+                "subnet_id": null,
                 "weight": 1
               },
               {
-                "address": "192.168.100.7",
+                "address": "192.168.100.20",
                 "admin_state_up": true,
-                "id": "ddffd64c-f3d8-4597-a4a0-dc63fac2b582",
-                "name": "",
+                "id": "6baae652-62bd-4671-817f-300b7941c7cf",
+                "name": null,
                 "protocol_port": 31443,
-                "subnet_id": "",
+                "subnet_id": null,
                 "weight": 1
               },
               {
-                "address": "192.168.100.9",
+                "address": "192.168.100.22",
                 "admin_state_up": true,
-                "id": "719d0bb9-8765-420e-a336-97a1aaa6660f",
-                "name": "",
+                "id": "11a2c3ba-1135-4b08-8df5-9ce30a98812f",
+                "name": null,
                 "protocol_port": 31443,
-                "subnet_id": "",
+                "subnet_id": null,
                 "weight": 1
               }
             ],
@@ -1601,6 +1315,7 @@
           },
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19",
           "dependencies": [
+            "module.compute.openstack_compute_instance_v2.k8s_node_high_memory",
             "module.compute.openstack_compute_instance_v2.k8s_node_no_floating_ip",
             "module.loadbalancer.openstack_lb_pool_v2.https"
           ]
diff --git a/creodias/terraform.tfstate.backup b/creodias/terraform.tfstate.backup
index b9f9ac7f..1c312062 100644
--- a/creodias/terraform.tfstate.backup
+++ b/creodias/terraform.tfstate.backup
@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "0.12.29",
-  "serial": 294,
+  "serial": 326,
   "lineage": "470e9021-37b9-9f2e-189c-3508fd25c4bd",
   "outputs": {
     "bastion_fips": {
@@ -44,22 +44,29 @@
         []
       ]
     },
-    "k8s_node_ips": {
+    "k8s_node_hm_ips": {
       "value": [
-        "192.168.100.3",
-        "192.168.100.17",
-        "192.168.100.9",
-        "192.168.100.7",
-        "192.168.100.12",
-        "192.168.100.16"
+        "192.168.100.22",
+        "192.168.100.20",
+        "192.168.100.18"
       ],
       "type": [
         "tuple",
         [
           "string",
           "string",
-          "string",
-          "string",
+          "string"
+        ]
+      ]
+    },
+    "k8s_node_ips": {
+      "value": [
+        "192.168.100.3",
+        "192.168.100.17"
+      ],
+      "type": [
+        "tuple",
+        [
           "string",
           "string"
         ]
@@ -128,7 +135,7 @@
             "sort_key": "name",
             "tag": null,
             "tags": [],
-            "updated_at": "2022-03-01T23:23:38Z",
+            "updated_at": "2023-09-28T01:40:27Z",
             "visibility": "public"
           }
         }
@@ -168,7 +175,7 @@
             "sort_key": "name",
             "tag": null,
             "tags": [],
-            "updated_at": "2022-03-01T23:23:38Z",
+            "updated_at": "2023-09-28T01:40:27Z",
             "visibility": "public"
           }
         }
@@ -721,7 +728,7 @@
       "module": "module.compute",
       "mode": "managed",
       "type": "openstack_compute_instance_v2",
-      "name": "k8s_node_no_floating_ip",
+      "name": "k8s_node_high_memory",
       "each": "list",
       "provider": "provider.openstack",
       "instances": [
@@ -729,7 +736,7 @@
           "index_key": 0,
           "schema_version": 0,
           "attributes": {
-            "access_ip_v4": "192.168.100.3",
+            "access_ip_v4": "192.168.100.22",
             "access_ip_v6": "",
             "admin_pass": null,
             "all_metadata": {
@@ -743,11 +750,11 @@
             "availability_zone_hints": null,
             "block_device": [],
             "config_drive": null,
-            "flavor_id": "21",
-            "flavor_name": "eo2.xlarge",
+            "flavor_id": "25",
+            "flavor_name": "hm.xlarge",
             "floating_ip": null,
             "force_delete": false,
-            "id": "8cee93a4-7f21-4538-9432-a7944b663e14",
+            "id": "40d42b6c-eeb0-475a-aead-74bef4f7aa34",
             "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
             "image_name": "Ubuntu 18.04 LTS",
             "key_pair": "kubernetes-demo",
@@ -757,24 +764,24 @@
               "ssh_user": "eouser",
               "use_access_ip": "1"
             },
-            "name": "demo-k8s-node-nf-1",
+            "name": "demo-k8s-node-hm-1",
             "network": [
               {
                 "access_network": false,
-                "fixed_ip_v4": "192.168.100.3",
+                "fixed_ip_v4": "192.168.100.22",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:40:53:ac",
+                "mac": "fa:16:3e:20:05:e9",
                 "name": "demo",
                 "port": "",
                 "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
               },
               {
                 "access_network": false,
-                "fixed_ip_v4": "10.111.0.115",
+                "fixed_ip_v4": "10.111.0.111",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:86:9b:2f",
+                "mac": "fa:16:3e:af:4b:26",
                 "name": "eodata",
                 "port": "",
                 "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
@@ -810,7 +817,7 @@
           "index_key": 1,
           "schema_version": 0,
           "attributes": {
-            "access_ip_v4": "192.168.100.17",
+            "access_ip_v4": "192.168.100.20",
             "access_ip_v6": "",
             "admin_pass": null,
             "all_metadata": {
@@ -824,11 +831,11 @@
             "availability_zone_hints": null,
             "block_device": [],
             "config_drive": null,
-            "flavor_id": "21",
-            "flavor_name": "eo2.xlarge",
+            "flavor_id": "25",
+            "flavor_name": "hm.xlarge",
             "floating_ip": null,
             "force_delete": false,
-            "id": "00d56072-1db8-4513-9ad4-957888a125b3",
+            "id": "c6b3a278-1d67-4f6b-8faa-96c341c2e993",
             "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
             "image_name": "Ubuntu 18.04 LTS",
             "key_pair": "kubernetes-demo",
@@ -838,24 +845,24 @@
               "ssh_user": "eouser",
               "use_access_ip": "1"
             },
-            "name": "demo-k8s-node-nf-2",
+            "name": "demo-k8s-node-hm-2",
             "network": [
               {
                 "access_network": false,
-                "fixed_ip_v4": "192.168.100.17",
+                "fixed_ip_v4": "192.168.100.20",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:2c:ed:72",
+                "mac": "fa:16:3e:26:d6:97",
                 "name": "demo",
                 "port": "",
                 "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
               },
               {
                 "access_network": false,
-                "fixed_ip_v4": "10.111.1.121",
+                "fixed_ip_v4": "10.111.0.116",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:5e:54:00",
+                "mac": "fa:16:3e:70:34:91",
                 "name": "eodata",
                 "port": "",
                 "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
@@ -891,88 +898,7 @@
           "index_key": 2,
           "schema_version": 0,
           "attributes": {
-            "access_ip_v4": "192.168.100.9",
-            "access_ip_v6": "",
-            "admin_pass": null,
-            "all_metadata": {
-              "depends_on": "7bc63c72-3d8a-424c-aa66-e000e36eedd5",
-              "kubespray_groups": "kube-node,k8s-cluster,no-floating,",
-              "ssh_user": "eouser",
-              "use_access_ip": "1"
-            },
-            "all_tags": [],
-            "availability_zone": "nova",
-            "availability_zone_hints": null,
-            "block_device": [],
-            "config_drive": null,
-            "flavor_id": "21",
-            "flavor_name": "eo2.xlarge",
-            "floating_ip": null,
-            "force_delete": false,
-            "id": "67b12004-bb39-4453-9903-4c1545b333c3",
-            "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
-            "image_name": "Ubuntu 18.04 LTS",
-            "key_pair": "kubernetes-demo",
-            "metadata": {
-              "depends_on": "7bc63c72-3d8a-424c-aa66-e000e36eedd5",
-              "kubespray_groups": "kube-node,k8s-cluster,no-floating,",
-              "ssh_user": "eouser",
-              "use_access_ip": "1"
-            },
-            "name": "demo-k8s-node-nf-3",
-            "network": [
-              {
-                "access_network": false,
-                "fixed_ip_v4": "192.168.100.9",
-                "fixed_ip_v6": "",
-                "floating_ip": "",
-                "mac": "fa:16:3e:19:84:6a",
-                "name": "demo",
-                "port": "",
-                "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
-              },
-              {
-                "access_network": false,
-                "fixed_ip_v4": "10.111.0.50",
-                "fixed_ip_v6": "",
-                "floating_ip": "",
-                "mac": "fa:16:3e:5a:dc:88",
-                "name": "eodata",
-                "port": "",
-                "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
-              }
-            ],
-            "network_mode": null,
-            "personality": [],
-            "power_state": "active",
-            "region": "RegionOne",
-            "scheduler_hints": [],
-            "security_groups": [
-              "demo-k8s",
-              "demo-k8s-worker"
-            ],
-            "stop_before_destroy": false,
-            "tags": [],
-            "timeouts": null,
-            "user_data": null,
-            "vendor_options": [],
-            "volume": []
-          },
-          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19",
-          "dependencies": [
-            "module.compute.openstack_compute_keypair_v2.k8s",
-            "module.compute.openstack_compute_servergroup_v2.k8s_node",
-            "module.compute.openstack_networking_secgroup_v2.k8s",
-            "module.compute.openstack_networking_secgroup_v2.worker",
-            "module.ips.openstack_networking_floatingip_v2.bastion",
-            "module.network.openstack_networking_router_v2.k8s"
-          ]
-        },
-        {
-          "index_key": 3,
-          "schema_version": 0,
-          "attributes": {
-            "access_ip_v4": "192.168.100.7",
+            "access_ip_v4": "192.168.100.18",
             "access_ip_v6": "",
             "admin_pass": null,
             "all_metadata": {
@@ -986,11 +912,11 @@
             "availability_zone_hints": null,
             "block_device": [],
             "config_drive": null,
-            "flavor_id": "21",
-            "flavor_name": "eo2.xlarge",
+            "flavor_id": "25",
+            "flavor_name": "hm.xlarge",
             "floating_ip": null,
             "force_delete": false,
-            "id": "49b22ff5-1e94-4853-b190-5899f1e67888",
+            "id": "4a1107a0-513e-4f9b-b0cc-a28fe8c41e5e",
             "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
             "image_name": "Ubuntu 18.04 LTS",
             "key_pair": "kubernetes-demo",
@@ -1000,24 +926,24 @@
               "ssh_user": "eouser",
               "use_access_ip": "1"
             },
-            "name": "demo-k8s-node-nf-4",
+            "name": "demo-k8s-node-hm-3",
             "network": [
               {
                 "access_network": false,
-                "fixed_ip_v4": "192.168.100.7",
+                "fixed_ip_v4": "192.168.100.18",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:cd:35:a8",
+                "mac": "fa:16:3e:10:55:d6",
                 "name": "demo",
                 "port": "",
                 "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
               },
               {
                 "access_network": false,
-                "fixed_ip_v4": "10.111.2.66",
+                "fixed_ip_v4": "10.111.0.51",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:1c:a5:f7",
+                "mac": "fa:16:3e:ab:c5:35",
                 "name": "eodata",
                 "port": "",
                 "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
@@ -1033,7 +959,7 @@
               "demo-k8s-worker"
             ],
             "stop_before_destroy": false,
-            "tags": [],
+            "tags": null,
             "timeouts": null,
             "user_data": null,
             "vendor_options": [],
@@ -1048,12 +974,22 @@
             "module.ips.openstack_networking_floatingip_v2.bastion",
             "module.network.openstack_networking_router_v2.k8s"
           ]
-        },
+        }
+      ]
+    },
+    {
+      "module": "module.compute",
+      "mode": "managed",
+      "type": "openstack_compute_instance_v2",
+      "name": "k8s_node_no_floating_ip",
+      "each": "list",
+      "provider": "provider.openstack",
+      "instances": [
         {
-          "index_key": 4,
+          "index_key": 0,
           "schema_version": 0,
           "attributes": {
-            "access_ip_v4": "192.168.100.12",
+            "access_ip_v4": "192.168.100.3",
             "access_ip_v6": "",
             "admin_pass": null,
             "all_metadata": {
@@ -1071,7 +1007,7 @@
             "flavor_name": "eo2.xlarge",
             "floating_ip": null,
             "force_delete": false,
-            "id": "59ac4bac-c957-428d-be9e-33322f9764fd",
+            "id": "8cee93a4-7f21-4538-9432-a7944b663e14",
             "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
             "image_name": "Ubuntu 18.04 LTS",
             "key_pair": "kubernetes-demo",
@@ -1081,24 +1017,24 @@
               "ssh_user": "eouser",
               "use_access_ip": "1"
             },
-            "name": "demo-k8s-node-nf-5",
+            "name": "demo-k8s-node-nf-1",
             "network": [
               {
                 "access_network": false,
-                "fixed_ip_v4": "192.168.100.12",
+                "fixed_ip_v4": "192.168.100.3",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:ca:c4:42",
+                "mac": "fa:16:3e:40:53:ac",
                 "name": "demo",
                 "port": "",
                 "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
               },
               {
                 "access_network": false,
-                "fixed_ip_v4": "10.111.0.107",
+                "fixed_ip_v4": "10.111.0.115",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:d5:2e:38",
+                "mac": "fa:16:3e:86:9b:2f",
                 "name": "eodata",
                 "port": "",
                 "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
@@ -1131,10 +1067,10 @@
           ]
         },
         {
-          "index_key": 5,
+          "index_key": 1,
           "schema_version": 0,
           "attributes": {
-            "access_ip_v4": "192.168.100.16",
+            "access_ip_v4": "192.168.100.17",
             "access_ip_v6": "",
             "admin_pass": null,
             "all_metadata": {
@@ -1152,7 +1088,7 @@
             "flavor_name": "eo2.xlarge",
             "floating_ip": null,
             "force_delete": false,
-            "id": "75cc49dd-a411-4155-86e7-14a3773dd3dd",
+            "id": "00d56072-1db8-4513-9ad4-957888a125b3",
             "image_id": "2ab579c3-96f1-4318-80bd-208237012fa4",
             "image_name": "Ubuntu 18.04 LTS",
             "key_pair": "kubernetes-demo",
@@ -1162,24 +1098,24 @@
               "ssh_user": "eouser",
               "use_access_ip": "1"
             },
-            "name": "demo-k8s-node-nf-6",
+            "name": "demo-k8s-node-nf-2",
             "network": [
               {
                 "access_network": false,
-                "fixed_ip_v4": "192.168.100.16",
+                "fixed_ip_v4": "192.168.100.17",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:29:f1:ee",
+                "mac": "fa:16:3e:2c:ed:72",
                 "name": "demo",
                 "port": "",
                 "uuid": "4c3df9dc-a2ed-44df-878a-7fb6ea0bd82d"
               },
               {
                 "access_network": false,
-                "fixed_ip_v4": "10.111.1.164",
+                "fixed_ip_v4": "10.111.1.121",
                 "fixed_ip_v6": "",
                 "floating_ip": "",
-                "mac": "fa:16:3e:51:f2:0d",
+                "mac": "fa:16:3e:5e:54:00",
                 "name": "eodata",
                 "port": "",
                 "uuid": "3b3c7f28-6c13-4850-b82a-2a2e351df74b"
@@ -1422,7 +1358,7 @@
             "description": "",
             "flavor_id": "",
             "id": "b7dbe891-6b43-4310-ad22-9dd83494caaa",
-            "loadbalancer_provider": "octavia",
+            "loadbalancer_provider": "amphora",
             "name": "demo-lb",
             "region": "RegionOne",
             "security_group_ids": [
@@ -1460,54 +1396,45 @@
             "id": "d9e0511f-701e-490e-88ed-a3e6f343e81f",
             "member": [
               {
-                "address": "192.168.100.12",
+                "address": "192.168.100.17",
                 "admin_state_up": true,
-                "id": "964b9085-473e-41a7-a6de-dcfc08ad2d63",
+                "id": "f1cbfa8a-ab13-4c4c-85ed-6350f296dcd4",
                 "name": "",
                 "protocol_port": 31080,
                 "subnet_id": "",
                 "weight": 1
               },
               {
-                "address": "192.168.100.16",
+                "address": "192.168.100.18",
                 "admin_state_up": true,
-                "id": "dd468e1b-9b34-4a75-a97f-020d1432effd",
+                "id": "4affd870-eb73-4dc4-b03d-b4c9bdab5150",
                 "name": "",
                 "protocol_port": 31080,
                 "subnet_id": "",
                 "weight": 1
               },
               {
-                "address": "192.168.100.17",
+                "address": "192.168.100.20",
                 "admin_state_up": true,
-                "id": "f1cbfa8a-ab13-4c4c-85ed-6350f296dcd4",
+                "id": "e697907f-b285-4d6f-88a4-0943ab4b67bf",
                 "name": "",
                 "protocol_port": 31080,
                 "subnet_id": "",
                 "weight": 1
               },
               {
-                "address": "192.168.100.3",
+                "address": "192.168.100.22",
                 "admin_state_up": true,
-                "id": "528d4c77-9816-4645-ae91-154938dfac40",
+                "id": "dc57a0da-2d89-410e-9524-13dac871b194",
                 "name": "",
                 "protocol_port": 31080,
                 "subnet_id": "",
                 "weight": 1
               },
               {
-                "address": "192.168.100.7",
-                "admin_state_up": true,
-                "id": "aa7d3609-2d9b-4a26-a0e4-63ae81cee84a",
-                "name": "",
-                "protocol_port": 31080,
-                "subnet_id": "",
-                "weight": 1
-              },
-              {
-                "address": "192.168.100.9",
+                "address": "192.168.100.3",
                 "admin_state_up": true,
-                "id": "f33d4574-4c81-4f66-aab4-2a23bbd0e725",
+                "id": "528d4c77-9816-4645-ae91-154938dfac40",
                 "name": "",
                 "protocol_port": 31080,
                 "subnet_id": "",
@@ -1520,8 +1447,15 @@
           },
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19",
           "dependencies": [
+            "module.compute.openstack_compute_instance_v2.k8s_node_high_memory",
             "module.compute.openstack_compute_instance_v2.k8s_node_no_floating_ip",
-            "module.loadbalancer.openstack_lb_pool_v2.http"
+            "module.compute.openstack_compute_keypair_v2.k8s",
+            "module.compute.openstack_compute_servergroup_v2.k8s_node",
+            "module.compute.openstack_networking_secgroup_v2.k8s",
+            "module.compute.openstack_networking_secgroup_v2.worker",
+            "module.ips.openstack_networking_floatingip_v2.bastion",
+            "module.loadbalancer.openstack_lb_pool_v2.http",
+            "module.network.openstack_networking_router_v2.k8s"
           ]
         }
       ]
@@ -1541,54 +1475,45 @@
             "id": "72d7473a-e169-473c-8a86-c177e474a01b",
             "member": [
               {
-                "address": "192.168.100.12",
-                "admin_state_up": true,
-                "id": "bfc90d51-622b-4f85-b265-5a770f5c7d63",
-                "name": "",
-                "protocol_port": 31443,
-                "subnet_id": "",
-                "weight": 1
-              },
-              {
-                "address": "192.168.100.16",
+                "address": "192.168.100.17",
                 "admin_state_up": true,
-                "id": "2c0ef083-28a9-4288-96d2-c697ff6fd142",
+                "id": "854800bf-54eb-4183-81b6-dd0fa37c6abc",
                 "name": "",
                 "protocol_port": 31443,
                 "subnet_id": "",
                 "weight": 1
               },
               {
-                "address": "192.168.100.17",
+                "address": "192.168.100.18",
                 "admin_state_up": true,
-                "id": "854800bf-54eb-4183-81b6-dd0fa37c6abc",
+                "id": "2f0330ed-9289-440a-9d78-8a3388606bb5",
                 "name": "",
                 "protocol_port": 31443,
                 "subnet_id": "",
                 "weight": 1
               },
               {
-                "address": "192.168.100.3",
+                "address": "192.168.100.20",
                 "admin_state_up": true,
-                "id": "969ecc91-3bd8-42fe-bbc4-7838a6081982",
+                "id": "6baae652-62bd-4671-817f-300b7941c7cf",
                 "name": "",
                 "protocol_port": 31443,
                 "subnet_id": "",
                 "weight": 1
               },
               {
-                "address": "192.168.100.7",
+                "address": "192.168.100.22",
                 "admin_state_up": true,
-                "id": "ddffd64c-f3d8-4597-a4a0-dc63fac2b582",
+                "id": "11a2c3ba-1135-4b08-8df5-9ce30a98812f",
                 "name": "",
                 "protocol_port": 31443,
                 "subnet_id": "",
                 "weight": 1
               },
               {
-                "address": "192.168.100.9",
+                "address": "192.168.100.3",
                 "admin_state_up": true,
-                "id": "719d0bb9-8765-420e-a336-97a1aaa6660f",
+                "id": "969ecc91-3bd8-42fe-bbc4-7838a6081982",
                 "name": "",
                 "protocol_port": 31443,
                 "subnet_id": "",
@@ -1601,8 +1526,15 @@
           },
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19",
           "dependencies": [
+            "module.compute.openstack_compute_instance_v2.k8s_node_high_memory",
             "module.compute.openstack_compute_instance_v2.k8s_node_no_floating_ip",
-            "module.loadbalancer.openstack_lb_pool_v2.https"
+            "module.compute.openstack_compute_keypair_v2.k8s",
+            "module.compute.openstack_compute_servergroup_v2.k8s_node",
+            "module.compute.openstack_networking_secgroup_v2.k8s",
+            "module.compute.openstack_networking_secgroup_v2.worker",
+            "module.ips.openstack_networking_floatingip_v2.bastion",
+            "module.loadbalancer.openstack_lb_pool_v2.https",
+            "module.network.openstack_networking_router_v2.k8s"
           ]
         }
       ]
@@ -1634,7 +1566,7 @@
             ],
             "protocol": "HTTP",
             "region": "RegionOne",
-            "tenant_id": "",
+            "tenant_id": "593918ef342a4bf1aea907d0c6058c1e",
             "timeouts": null
           },
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19",
@@ -1675,7 +1607,7 @@
             ],
             "protocol": "HTTPS",
             "region": "RegionOne",
-            "tenant_id": "",
+            "tenant_id": "593918ef342a4bf1aea907d0c6058c1e",
             "timeouts": null
           },
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19",
diff --git a/creodias/variables.tf b/creodias/variables.tf
index e6c556b4..75b9ad74 100644
--- a/creodias/variables.tf
+++ b/creodias/variables.tf
@@ -40,6 +40,10 @@ variable "number_of_k8s_nodes_no_floating_ip" {
   default = 1
 }
 
+variable "number_of_k8s_nodes_hm" {
+  default = 1
+}
+
 variable "number_of_gfs_nodes_no_floating_ip" {
   default = 0
 }