diff --git a/terraform/main.tf b/terraform/main.tf
index 8d6c1ab0c391f4140f6f72cb9179ebee0eb207c1..0975979ca23bba03eda11f5366e1119b8212db5e 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -23,12 +23,12 @@ data "openstack_networking_network_v2" "external" {
 
 # Create virtual machine
 resource "openstack_compute_instance_v2" "vm1" {
-  name        = "concrete_vm"
+  name        = "nginx_host"
   image_name  = "Ubuntu-Focal-20.04-Daily-2022-04-19"
   flavor_name = "small"
   key_pair    = openstack_compute_keypair_v2.user1.name
   network { 
-    port = openstack_networking_port_v2.net1_networking_port.id
+    port = openstack_networking_port_v2.net1_subnet_networking_port.id
     
   }
 }
@@ -47,49 +47,43 @@ resource "openstack_compute_floatingip_associate_v2" "vm1_floating_ip_associatio
 
 # Router interface configuration
 
-resource "openstack_networking_router_interface_v2" "net1_router_interface" {
+resource "openstack_networking_router_interface_v2" "net1_subnet_router_interface" {
   router_id = openstack_networking_router_v2.router.id
-  subnet_id = openstack_networking_subnet_v2.net1_subnet.id
+  subnet_id = openstack_networking_subnet_v2.net1_subnet_subnet.id
 }
 
 
 ## Network
 
 # Create Network
-resource "openstack_networking_network_v2" "net1" {
+resource "openstack_networking_network_v2" "ostack2" {
   name = "concrete_net"
 }
 
-# Create network port
-resource "openstack_networking_port_v2" "net1_networking_port" {
-  name           = "net1"
-  network_id     = openstack_networking_network_v2.net1.id
+# Subnet
+resource "openstack_networking_subnet_v2" "net1_subnet_subnet" {
+  name            = "net1_subnet_subnet"
+  network_id      = openstack_networking_network_v2.ostack2.id
+  cidr            = "16.0.0.0/24"
+  dns_nameservers = ["8.8.8.8", "8.8.8.4"]
+}
+# Attach networking port
+resource "openstack_networking_port_v2" "net1_subnet_networking_port" {
+  name           = "concrete_net"
+  network_id     = openstack_networking_network_v2.ostack2.id
   admin_state_up = true
   security_group_ids = [
-    data.openstack_networking_secgroup_v2.default.id        #default flavour id
+  openstack_compute_secgroup_v2.icmp.id,
+  openstack_compute_secgroup_v2.http.id,
+  openstack_compute_secgroup_v2.https.id,
+  openstack_compute_secgroup_v2.ssh.id,
+  
   ]
   fixed_ip {
-    subnet_id = openstack_networking_subnet_v2.net1_subnet.id
+   subnet_id = openstack_networking_subnet_v2.net1_subnet_subnet.id
   }
 }
 
-data "openstack_identity_project_v3" "test_tenant" {
-  name = "demo"
-}
-
-data "openstack_networking_secgroup_v2" "default" {
-  name = "default"
-  tenant_id = data.openstack_identity_project_v3.test_tenant.id
-}
-
-
-# Subnet configuration
-resource "openstack_networking_subnet_v2" "net1_subnet" {
-  name            = "net1_subnet"
-  network_id      = openstack_networking_network_v2.net1.id
-  cidr            = "16.0.0.0/24"
-  dns_nameservers = ["8.8.8.8", "8.8.8.4"]
-}
 
 
 # Create router
@@ -102,7 +96,7 @@ resource "openstack_networking_router_v2" "router" { ## 1router, not parametric
 
 # Create ssh keys
 resource "openstack_compute_keypair_v2" "user1" {
-  name       = "integration-test"
+  name       = "user-test"
   public_key = ""
 }
 
@@ -154,4 +148,3 @@ resource "openstack_compute_secgroup_v2" "ssh" {
   }
 }
 
-