diff --git a/01-network.tf b/01-network.tf
index ea29fd3..5d1f4f9 100644
--- a/01-network.tf
+++ b/01-network.tf
@@ -1,5 +1,5 @@
 resource "stackit_network" "mgmt_network" {
-  project_id          = module.project.project_info.project_id
+  project_id          = module.project.project_info["project_id"]
   name                = "mgmt_network"
   ipv4_nameservers    = ["1.1.1.1", "8.8.8.8"]
   ipv4_prefix_length  = 24
@@ -8,7 +8,7 @@ resource "stackit_network" "mgmt_network" {
 }
 
 resource "stackit_network" "ha_network" {
-  project_id         = "module.project.project_info.project_id"
+  project_id         = module.project.project_info["project_id"]
   name               = "ha_network"
   ipv4_prefix_length = 24
   ipv4_prefix        = "10.220.254.0/24"
@@ -16,7 +16,7 @@ resource "stackit_network" "ha_network" {
 }
 
 resource "stackit_network" "wan_network" {
-  project_id          = module.project.project_info.project_id
+  project_id          = module.project.project_info["project_id"]
   name                = "wan_network"
   ipv4_nameservers    = ["1.1.1.1", "8.8.8.8"]
   ipv4_prefix_length  = 24
@@ -26,7 +26,7 @@ resource "stackit_network" "wan_network" {
 
 
 resource "stackit_network" "lan_network1" {
-  project_id         = module.project.project_info.project_id
+  project_id         = module.project.project_info["project_id"]
   name               = "lan_network1"
   ipv4_prefix_length = 24
   ipv4_prefix        = "10.220.1.0/24"
@@ -34,7 +34,7 @@ resource "stackit_network" "lan_network1" {
 }
 
 resource "stackit_network" "lan_network2" {
-  project_id         = module.project.project_info.project_id
+  project_id         = module.project.project_info["project_id"]
   name               = "lan_network2"
   ipv4_prefix_length = 24
   ipv4_prefix        = "10.220.2.0/24"
@@ -42,7 +42,7 @@ resource "stackit_network" "lan_network2" {
 }
 
 resource "stackit_network_interface" "mgmt" {
-  project_id        = module.project.project_info.project_id
+  project_id        = module.project.project_info["project_id"]
   network_id        = stackit_network.mgmt_network.network_id
   security          = false
   name              = "MGMT"
@@ -50,25 +50,25 @@ resource "stackit_network_interface" "mgmt" {
 }
 
 resource "stackit_network_interface" "ha" {
-  project_id         = module.project.project_info.project_id
+  project_id         = module.project.project_info["project_id"]
   network_id         = stackit_network.ha_network.network_id
   security           = false
   name              = "HA"
   ipv4              = "10.220.254.100"
 }
 resource "stackit_network_interface" "wan" {
-  project_id        = module.project.project_info.project_id
+  project_id        = module.project.project_info["project_id"]
   network_id        = stackit_network.wan_network.network_id
   security          = true
   name              = "MGMT"
   ipv4              = "10.220.131.10"
   allowed_addresses  = ["10.220.131.30/32"]
-  security_group_ids = ["2d7c21fc-16af-4dda-91b3-15d98f895c1e"]
+  security_group_ids = ["92fc0cad-1a6f-495f-89da-2a12100bea68"]
 
 }
 
 resource "stackit_network_interface" "mgmt2" {
-  project_id        = module.project.project_info.project_id
+  project_id        = module.project.project_info["project_id"]
   network_id        = stackit_network.mgmt_network.network_id
   security          = false
   name              = "MGMT2"
@@ -76,24 +76,24 @@ resource "stackit_network_interface" "mgmt2" {
 }
 
 resource "stackit_network_interface" "ha2" {
-  project_id         = module.project.project_info.project_id
+  project_id         = module.project.project_info["project_id"]
   network_id         = stackit_network.ha_network.network_id
   security           = false
   name              = "HA2"
   ipv4              = "10.220.254.200"
 }
 resource "stackit_network_interface" "wan2" {
-  project_id        = module.project.project_info.project_id
+  project_id        = module.project.project_info["project_id"]
   network_id        = stackit_network.wan_network.network_id
   security          = true
   name              = "WAN2"
   ipv4              = "10.220.131.20"
   allowed_addresses  = ["10.220.131.30/32"]
-  security_group_ids = ["2d7c21fc-16af-4dda-91b3-15d98f895c1e"]
+  security_group_ids = ["92fc0cad-1a6f-495f-89da-2a12100bea68"]
 }
 
 resource "stackit_network_interface" "vip" {
-  project_id        = module.project.project_info.project_id
+  project_id        = module.project.project_info["project_id"]
   network_id        = stackit_network.wan_network.network_id
   security          = false
   name              = "VIP"
@@ -101,33 +101,33 @@ resource "stackit_network_interface" "vip" {
 }
 
 resource "stackit_network_interface" "lan1" {
-  project_id         = module.project.project_info.project_id
+  project_id         = module.project.project_info["project_id"]
   network_id         = stackit_network.lan_network1.network_id
   security           = false
   name              = "LAN1"
 }
 resource "stackit_network_interface" "lan1_2" {
-  project_id         = module.project.project_info.project_id
+  project_id         = module.project.project_info["project_id"]
   network_id         = stackit_network.lan_network1.network_id
   security           = false
   name              = "LAN1"
 }
 
 resource "stackit_network_interface" "lan2" {
-  project_id         = module.project.project_info.project_id
+  project_id         = module.project.project_info["project_id"]
   network_id         = stackit_network.lan_network2.network_id
   security           = false
   name              = "LAN2"
 }
 resource "stackit_network_interface" "lan2_2" {
-  project_id         = module.project.project_info.project_id
+  project_id         = module.project.project_info["project_id"]
   network_id         = stackit_network.lan_network2.network_id
   security           = false
   name              = "LAN2"
 }
 
 resource "stackit_network_interface" "vip_lan" {
-  project_id         = module.project.project_info.project_id
+  project_id         = module.project.project_info["project_id"]
   network_id         = stackit_network.mgmt_network.network_id
   security           = false
   name              = "LANMGMTVIP"
@@ -135,28 +135,28 @@ resource "stackit_network_interface" "vip_lan" {
 }
 
 resource "stackit_public_ip" "mgmt_ip" {
-  project_id           = module.project.project_info.project_id
+  project_id           = module.project.project_info["project_id"]
   network_interface_id = stackit_network_interface.mgmt.network_interface_id
 }
 
 resource "stackit_public_ip" "wan_ip" {
-  project_id           = module.project.project_info.project_id
+  project_id           = module.project.project_info["project_id"]
   network_interface_id = stackit_network_interface.wan.network_interface_id
 }
 
 
 resource "stackit_public_ip" "mgmt2_ip" {
-  project_id           = module.project.project_info.project_id
+  project_id           = module.project.project_info["project_id"]
   network_interface_id = stackit_network_interface.mgmt2.network_interface_id
 }
 
 resource "stackit_public_ip" "wan2_ip" {
-  project_id           = module.project.project_info.project_id
+  project_id           = module.project.project_info["project_id"]
   network_interface_id = stackit_network_interface.wan2.network_interface_id
 }
 
 resource "stackit_public_ip" "vip_ip" {
-  project_id           = module.project.project_info.project_id
+  project_id           = module.project.project_info["project_id"]
   network_interface_id = stackit_network_interface.vip.network_interface_id
 }
 
diff --git a/02-paloalto-image.tf b/02-paloalto-image.tf
index aba483d..5abfc2c 100644
--- a/02-paloalto-image.tf
+++ b/02-paloalto-image.tf
@@ -1,6 +1,6 @@
 // Upload VPN Appliance Image to STACKIT
 resource "stackit_image" "paloalto" {
-  project_id      = module.project.project_info.project_id
+  project_id      = module.project.project_info["project_id"]
   name            = "PA-VM-KVM-11.2.5-root"
   local_file_path = "./PA-VM-KVM-11.2.5.qcow2"
   disk_format     = "qcow2"
diff --git a/03-paloalto_appliance.tf b/03-paloalto_appliance.tf
index 96421c6..276ccf1 100644
--- a/03-paloalto_appliance.tf
+++ b/03-paloalto_appliance.tf
@@ -1,5 +1,5 @@
 resource "stackit_volume" "paloalto_vol" {
-  project_id        = module.project.project_info.project_id
+  project_id        = module.project.project_info["project_id"]
   name              = "PA-VM-KVM-11.2.5-root"
   availability_zone = var.region_az1
   size              = 100
@@ -11,7 +11,7 @@ resource "stackit_volume" "paloalto_vol" {
 }
 
 resource "stackit_server" "paloalto_server" {
-  project_id      = module.project.project_info.project_id
+  project_id      = module.project.project_info["project_id"]
   name            = "paloAlto"
   boot_volume = {
     source_type   = "volume"
@@ -23,7 +23,7 @@ resource "stackit_server" "paloalto_server" {
 }
 
 resource "stackit_volume" "paloalto_vol_2" {
-  project_id        = module.project.project_info.project_id
+  project_id        = module.project.project_info["project_id"]
   name              = "PA-VM-KVM-11.2.5-root2"
   availability_zone = var.region_az2
   size              = 100
@@ -35,7 +35,7 @@ resource "stackit_volume" "paloalto_vol_2" {
 }
 
 resource "stackit_server" "paloalto_server_2" {
-  project_id      = module.project.project_info.project_id
+  project_id      = module.project.project_info["project_id"]
   name            = "paloAlto2"
   boot_volume = {
     source_type   = "volume"
diff --git a/99-variables.tf b/99-variables.tf
index 056bdef..6ec05d6 100644
--- a/99-variables.tf
+++ b/99-variables.tf
@@ -4,7 +4,7 @@ variable "organization_id" {
 }
 
 variable "service_account_key_path" {
-  default = "/root/.credentials/key.json"
+  default = "~/.stackit/credentials.json"
 }
 
 variable "default_region" {
diff --git a/attachment.tf b/attachment.tf
deleted file mode 100644
index 7645e62..0000000
--- a/attachment.tf
+++ /dev/null
@@ -1,25 +0,0 @@
-resource "stackit_server_network_interface_attach" "nic-attachment-lan1" {
-  project_id           = module.project.project_info.project_id
-  server_id            = stackit_server.paloalto_server.server_id
-  network_interface_id = stackit_network_interface.lan1.network_interface_id
-  depends_on = [ stackit_server_network_interface_attach.nic-attachment-lan1 ]
-}
-resource "stackit_server_network_interface_attach" "nic-attachment-lan2" {
-  project_id           = module.project.project_info.project_id
-  server_id            = stackit_server.paloalto_server.server_id
-  network_interface_id = stackit_network_interface.lan2.network_interface_id
-  depends_on = [ stackit_server_network_interface_attach.nic-attachment-lan1 ]
-}
-
-resource "stackit_server_network_interface_attach" "nic-attachment-lan1_2" {
-  project_id           = module.project.project_info.project_id
-  server_id            = stackit_server.paloalto_server_2.server_id
-  network_interface_id = stackit_network_interface.lan1_2.network_interface_id
-  depends_on = [ stackit_server_network_interface_attach.nic-attachment-lan2 ]
-}
-resource "stackit_server_network_interface_attach" "nic-attachment-lan2_2" {
-  project_id           = module.project.project_info.project_id
-  server_id            = stackit_server.paloalto_server_2.server_id
-  network_interface_id = stackit_network_interface.lan2_2.network_interface_id
-  depends_on = [ stackit_server_network_interface_attach.nic-attachment-lan1_2 ]
-}
diff --git a/project/99-variables.tf b/project/99-variables.tf
index 914f292..d76b1e5 100644
--- a/project/99-variables.tf
+++ b/project/99-variables.tf
@@ -1,10 +1,10 @@
 # -- network variables
 variable "organization_id" {
-  default = "f11f166b-ecd8-4a73-8022-208700ad5aec"
+  default = "03a34540-3c1a-4794-b2c6-7111ecf824ef"
 }
 
 variable "service_account_key_path" {
-  default = "../key.json"
+  default = "~/.stackit/credentials.json"
 }
 
 variable "default_region" {