diff --git a/hpc/main_net_dns_router/main.tf b/hpc/main_net_dns_router/main.tf
index ba6fa9c..1719ff2 100644
--- a/hpc/main_net_dns_router/main.tf
+++ b/hpc/main_net_dns_router/main.tf
@@ -85,14 +85,26 @@ output "os_project_data" {
   value = module.main_private_net_and_dns_zone.os_project_data
 }
 
+output "dns_zone" {
+  value = module.main_private_net_and_dns_zone.dns_zone
+}
+
 output "dns_zone_id" {
   value = module.main_private_net_and_dns_zone.dns_zone_id
 }
 
+output "main_private_network" {
+  value = module.main_private_net_and_dns_zone.main_private_network
+}
+
 output "main_private_network_id" {
   value = module.main_private_net_and_dns_zone.main_private_network_id
 }
 
+output "main_subnet_network" {
+  value = module.main_private_net_and_dns_zone.main_subnet_network
+}
+
 output "main_subnet_network_id" {
   value = module.main_private_net_and_dns_zone.main_subnet_network_id
 }
@@ -142,10 +154,6 @@ output "ssh_sources" {
   value = module.labs_common_variables.ssh_sources
 }
 
-output "ubuntu_1804" {
-  value = module.labs_common_variables.ubuntu_1804
-}
-
 output "ubuntu_2204" {
   value = module.labs_common_variables.ubuntu_2204
 }
@@ -158,10 +166,6 @@ output "almalinux_9" {
   value = module.labs_common_variables.almalinux_9
 }
 
-output "ubuntu1804_data_file" {
-  value = module.labs_common_variables.ubuntu1804_data_file
-}
-
 output "ubuntu2204_data_file" {
   value = module.labs_common_variables.ubuntu2204_data_file
 }
@@ -177,3 +181,7 @@ output "policy_list" {
 output "flavor_list" {
   value = module.labs_common_variables.flavor_list
 }
+
+output "default_security_group_name" {
+  value = module.labs_common_variables.default_security_group_name
+}
diff --git a/hpc/main_net_dns_router/terraform.tfstate b/hpc/main_net_dns_router/terraform.tfstate
index 6bffe8e..c03da8b 100644
--- a/hpc/main_net_dns_router/terraform.tfstate
+++ b/hpc/main_net_dns_router/terraform.tfstate
@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.6.6",
-  "serial": 16,
+  "serial": 19,
   "lineage": "b2aa8a80-ab4a-7b4d-da5a-b76f7d41a2ed",
   "outputs": {
     "almalinux_9": {
@@ -35,6 +35,7 @@
     "centos_7": {
       "value": {
         "name": "CentOS-7",
+        "user_data_file": "../../s2i2s_openstack_vm_data_scripts/el.sh",
         "uuid": "f0187a99-64f6-462a-ab5f-ef52fe62f2ca"
       },
       "type": [
@@ -42,12 +43,67 @@
         "string"
       ]
     },
+    "default_security_group_name": {
+      "value": "default_for_all",
+      "type": "string"
+    },
+    "dns_zone": {
+      "value": {
+        "attributes": {},
+        "description": "DNS primary zone for the hpc-lab project",
+        "disable_status_check": false,
+        "email": "postmaster@isti.cnr.it",
+        "id": "9d929715-2dd7-4859-a52a-bd148d2a6694",
+        "masters": [],
+        "name": "hpc.cloud.isti.cnr.it.",
+        "project_id": "adaf7e28a31e465795359fcde26398b7",
+        "region": "isti_area_pi_1",
+        "timeouts": null,
+        "ttl": 8600,
+        "type": "PRIMARY",
+        "value_specs": null
+      },
+      "type": [
+        "object",
+        {
+          "attributes": [
+            "map",
+            "string"
+          ],
+          "description": "string",
+          "disable_status_check": "bool",
+          "email": "string",
+          "id": "string",
+          "masters": [
+            "set",
+            "string"
+          ],
+          "name": "string",
+          "project_id": "string",
+          "region": "string",
+          "timeouts": [
+            "object",
+            {
+              "create": "string",
+              "delete": "string",
+              "update": "string"
+            }
+          ],
+          "ttl": "number",
+          "type": "string",
+          "value_specs": [
+            "map",
+            "string"
+          ]
+        }
+      ]
+    },
     "dns_zone_id": {
       "value": "9d929715-2dd7-4859-a52a-bd148d2a6694",
       "type": "string"
     },
     "el7_data_file": {
-      "value": "../../openstack_vm_data_scripts/el7.sh",
+      "value": "../../s2i2s_openstack_vm_data_scripts/el.sh",
       "type": "string"
     },
     "external_gateway_ip": {
@@ -111,6 +167,87 @@
         "string"
       ]
     },
+    "main_private_network": {
+      "value": {
+        "admin_state_up": true,
+        "all_tags": [],
+        "availability_zone_hints": [],
+        "description": "HPC lab private network (use this as the main network)",
+        "dns_domain": "hpc.cloud.isti.cnr.it.",
+        "external": false,
+        "id": "5ef3fcdd-590c-4034-a46d-9ddd60693c57",
+        "mtu": 8942,
+        "name": "hpc-cloud-main",
+        "port_security_enabled": true,
+        "qos_policy_id": "",
+        "region": "isti_area_pi_1",
+        "segments": [
+          {
+            "network_type": "geneve",
+            "physical_network": "",
+            "segmentation_id": 30164
+          }
+        ],
+        "shared": false,
+        "tags": [],
+        "tenant_id": "adaf7e28a31e465795359fcde26398b7",
+        "timeouts": null,
+        "transparent_vlan": false,
+        "value_specs": null
+      },
+      "type": [
+        "object",
+        {
+          "admin_state_up": "bool",
+          "all_tags": [
+            "set",
+            "string"
+          ],
+          "availability_zone_hints": [
+            "set",
+            "string"
+          ],
+          "description": "string",
+          "dns_domain": "string",
+          "external": "bool",
+          "id": "string",
+          "mtu": "number",
+          "name": "string",
+          "port_security_enabled": "bool",
+          "qos_policy_id": "string",
+          "region": "string",
+          "segments": [
+            "set",
+            [
+              "object",
+              {
+                "network_type": "string",
+                "physical_network": "string",
+                "segmentation_id": "number"
+              }
+            ]
+          ],
+          "shared": "bool",
+          "tags": [
+            "set",
+            "string"
+          ],
+          "tenant_id": "string",
+          "timeouts": [
+            "object",
+            {
+              "create": "string",
+              "delete": "string"
+            }
+          ],
+          "transparent_vlan": "bool",
+          "value_specs": [
+            "map",
+            "string"
+          ]
+        }
+      ]
+    },
     "main_private_network_id": {
       "value": "5ef3fcdd-590c-4034-a46d-9ddd60693c57",
       "type": "string"
@@ -119,6 +256,125 @@
       "value": "isti_area_pi_1",
       "type": "string"
     },
+    "main_subnet_network": {
+      "value": {
+        "all_tags": [],
+        "allocation_pool": [
+          {
+            "end": "10.13.7.254",
+            "start": "10.13.1.1"
+          }
+        ],
+        "allocation_pools": [
+          {
+            "end": "10.13.7.254",
+            "start": "10.13.1.1"
+          }
+        ],
+        "cidr": "10.13.0.0/21",
+        "description": "HPC lab main private subnet",
+        "dns_nameservers": [
+          "146.48.29.97",
+          "146.48.29.98",
+          "146.48.29.99"
+        ],
+        "enable_dhcp": true,
+        "gateway_ip": "10.13.0.1",
+        "host_routes": [],
+        "id": "84e50cdf-3f92-4e2c-b366-4e30cfcb913e",
+        "ip_version": 4,
+        "ipv6_address_mode": "",
+        "ipv6_ra_mode": "",
+        "name": "hpc-cloud-main-subnet",
+        "network_id": "5ef3fcdd-590c-4034-a46d-9ddd60693c57",
+        "no_gateway": false,
+        "prefix_length": null,
+        "region": "isti_area_pi_1",
+        "service_types": [],
+        "subnetpool_id": "",
+        "tags": [],
+        "tenant_id": "adaf7e28a31e465795359fcde26398b7",
+        "timeouts": null,
+        "value_specs": null
+      },
+      "type": [
+        "object",
+        {
+          "all_tags": [
+            "set",
+            "string"
+          ],
+          "allocation_pool": [
+            "set",
+            [
+              "object",
+              {
+                "end": "string",
+                "start": "string"
+              }
+            ]
+          ],
+          "allocation_pools": [
+            "list",
+            [
+              "object",
+              {
+                "end": "string",
+                "start": "string"
+              }
+            ]
+          ],
+          "cidr": "string",
+          "description": "string",
+          "dns_nameservers": [
+            "list",
+            "string"
+          ],
+          "enable_dhcp": "bool",
+          "gateway_ip": "string",
+          "host_routes": [
+            "list",
+            [
+              "object",
+              {
+                "destination_cidr": "string",
+                "next_hop": "string"
+              }
+            ]
+          ],
+          "id": "string",
+          "ip_version": "number",
+          "ipv6_address_mode": "string",
+          "ipv6_ra_mode": "string",
+          "name": "string",
+          "network_id": "string",
+          "no_gateway": "bool",
+          "prefix_length": "number",
+          "region": "string",
+          "service_types": [
+            "list",
+            "string"
+          ],
+          "subnetpool_id": "string",
+          "tags": [
+            "set",
+            "string"
+          ],
+          "tenant_id": "string",
+          "timeouts": [
+            "object",
+            {
+              "create": "string",
+              "delete": "string"
+            }
+          ],
+          "value_specs": [
+            "map",
+            "string"
+          ]
+        }
+      ]
+    },
     "main_subnet_network_id": {
       "value": "84e50cdf-3f92-4e2c-b366-4e30cfcb913e",
       "type": "string"
@@ -176,29 +432,14 @@
         "string"
       ]
     },
-    "ubuntu1804_data_file": {
-      "value": "../../openstack_vm_data_scripts/ubuntu1804.sh",
-      "type": "string"
-    },
     "ubuntu2204_data_file": {
-      "value": "../../openstack_vm_data_scripts/ubuntu2204.sh",
+      "value": "../../s2i2s_openstack_vm_data_scripts/ubuntu2204.sh",
       "type": "string"
     },
-    "ubuntu_1804": {
-      "value": {
-        "name": "Ubuntu-Bionic-18.04",
-        "user_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh",
-        "uuid": "7ed6a2cd-2b07-482e-8ce4-f018dff16c89"
-      },
-      "type": [
-        "map",
-        "string"
-      ]
-    },
     "ubuntu_2204": {
       "value": {
         "name": "Ubuntu-Jammy-22.04",
-        "user_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh",
+        "user_data_file": "../../s2i2s_openstack_vm_data_scripts/ubuntu2204.sh",
         "uuid": "54768889-8556-4be4-a2eb-82a4d9b34627"
       },
       "type": [
@@ -267,7 +508,7 @@
               }
             ],
             "shared": false,
-            "tags": null,
+            "tags": [],
             "tenant_id": "adaf7e28a31e465795359fcde26398b7",
             "timeouts": null,
             "transparent_vlan": false,
@@ -611,7 +852,7 @@
             "region": "isti_area_pi_1",
             "service_types": [],
             "subnetpool_id": "",
-            "tags": null,
+            "tags": [],
             "tenant_id": "adaf7e28a31e465795359fcde26398b7",
             "timeouts": null,
             "value_specs": null