diff --git a/modules/instance_with_data_volume/instance_with_data_volume.tf b/modules/instance_with_data_volume/instance_with_data_volume.tf
index 541099a..b8e5cc0 100644
--- a/modules/instance_with_data_volume/instance_with_data_volume.tf
+++ b/modules/instance_with_data_volume/instance_with_data_volume.tf
@@ -6,7 +6,7 @@ module "ssh_settings" {
 
 # Module used
 module "common_variables" {
-  source = "../../modules/common_variables"
+  source = "../../modules/labs_common_variables"
 }
 
 resource "openstack_blockstorage_volume_v3" "instance_data_volume" {
diff --git a/modules/instance_without_data_volume/instance_without_data_volume.tf b/modules/instance_without_data_volume/instance_without_data_volume.tf
index 452442c..4bfcdf2 100644
--- a/modules/instance_without_data_volume/instance_without_data_volume.tf
+++ b/modules/instance_without_data_volume/instance_without_data_volume.tf
@@ -6,11 +6,11 @@ module "ssh_settings" {
 
 # Module used
 module "common_variables" {
-  source = "../../modules/common_variables"
+  source = "../../modules/labs_common_variables"
 }
 
 # Generic smartgears_service instance
-resource "openstack_compute_instance_v2" "smartgears_service" {
+resource "openstack_compute_instance_v2" "vm_without_volume" {
   for_each                = var.instances_without_data_volume_map
   name                    = each.value.name
   availability_zone_hints = module.common_variables.availability_zone_no_gpu_name
diff --git a/modules/labs_common_variables/outputs.tf b/modules/labs_common_variables/outputs.tf
index c1595ca..6ab6c2b 100644
--- a/modules/labs_common_variables/outputs.tf
+++ b/modules/labs_common_variables/outputs.tf
@@ -40,10 +40,6 @@ output "ssh_sources" {
   value = var.ssh_sources
 }
 
-output "ubuntu_1804" {
-  value = var.ubuntu_1804
-}
-
 output "ubuntu_2204" {
   value = var.ubuntu_2204
 }
@@ -56,10 +52,6 @@ output "almalinux_9" {
   value = var.almalinux_9
 }
 
-output "ubuntu1804_data_file" {
-  value = var.ubuntu1804_data_file
-}
-
 output "ubuntu2204_data_file" {
   value = var.ubuntu2204_data_file
 }
diff --git a/modules/labs_common_variables/variables.tf b/modules/labs_common_variables/variables.tf
index fc71aa4..e1dfdf0 100644
--- a/modules/labs_common_variables/variables.tf
+++ b/modules/labs_common_variables/variables.tf
@@ -37,22 +37,12 @@ variable "availability_zones_names" {
   }
 }
 
-variable "ubuntu_1804" {
-  type = map(string)
-
-  default = {
-    name           = "Ubuntu-Bionic-18.04"
-    uuid           = "7ed6a2cd-2b07-482e-8ce4-f018dff16c89"
-    user_data_file = "../../openstack_vm_data_scripts/ubuntu1804.sh"
-  }
-}
-
 variable "ubuntu_2204" {
   type = map(string)
   default = {
     name           = "Ubuntu-Jammy-22.04"
     uuid           = "54768889-8556-4be4-a2eb-82a4d9b34627"
-    user_data_file = "../../openstack_vm_data_scripts/ubuntu2204.sh"
+    user_data_file = "../../s2i2s_openstack_vm_data_scripts/ubuntu2204.sh"
   }
 }
 
@@ -61,6 +51,7 @@ variable "centos_7" {
   default = {
     name = "CentOS-7"
     uuid = "f0187a99-64f6-462a-ab5f-ef52fe62f2ca"
+    user_data_file = "../../s2i2s_openstack_vm_data_scripts/el.sh"
   }
 }
 
@@ -72,16 +63,12 @@ variable "almalinux_9" {
   }
 }
 
-variable "ubuntu1804_data_file" {
-  default = "../../openstack_vm_data_scripts/ubuntu1804.sh"
-}
-
 variable "ubuntu2204_data_file" {
-  default = "../../openstack_vm_data_scripts/ubuntu2204.sh"
+  default = "../../s2i2s_openstack_vm_data_scripts/ubuntu2204.sh"
 }
 
 variable "el7_data_file" {
-  default = "../../openstack_vm_data_scripts/el7.sh"
+  default = "../../s2i2s_openstack_vm_data_scripts/el.sh"
 }
 
 variable "ssh_jump_proxy" {
diff --git a/modules/labs_private_net_and_dns_zone/outputs.tf b/modules/labs_private_net_and_dns_zone/outputs.tf
index 0bcd9da..6bdb5fe 100644
--- a/modules/labs_private_net_and_dns_zone/outputs.tf
+++ b/modules/labs_private_net_and_dns_zone/outputs.tf
@@ -1,11 +1,23 @@
+output "dns_zone" {
+  value = openstack_dns_zone_v2.primary_project_dns_zone
+}
+
 output "dns_zone_id" {
   value = openstack_dns_zone_v2.primary_project_dns_zone.id
 }
 
+output "main_private_network" {
+  value = openstack_networking_network_v2.main-private-network
+}
+
 output "main_private_network_id" {
   value = openstack_networking_network_v2.main-private-network.id
 }
 
+output "main_subnet_network" {
+  value = openstack_networking_subnet_v2.main-private-subnet
+}
+
 output "main_subnet_network_id" {
   value = openstack_networking_subnet_v2.main-private-subnet.id
 }