diff --git a/infra/terraform/k3s.tf b/infra/terraform/k3s.tf
index 29426bd..24e00e6 100644
--- a/infra/terraform/k3s.tf
+++ b/infra/terraform/k3s.tf
@@ -30,7 +30,7 @@ resource "proxmox_vm_qemu" "k3smaster" {
     ide {
       ide2 {
         cloudinit {
-          storage = local.storage
+          storage = local.k3smaster.storage
         }
       }
     }
@@ -39,7 +39,7 @@ resource "proxmox_vm_qemu" "k3smaster" {
         disk {
           size    = local.k3smaster.drive
           format  = local.format
-          storage = local.storage
+          storage = local.k3smaster.storage
         }
       }
     }
@@ -89,7 +89,7 @@ resource "proxmox_vm_qemu" "k3sserver" {
     ide {
       ide2 {
         cloudinit {
-          storage = local.storage
+          storage = local.k3sserver.storage
         }
       }
     }
@@ -98,7 +98,7 @@ resource "proxmox_vm_qemu" "k3sserver" {
         disk {
           size    = local.k3sserver.drive
           format  = local.format
-          storage = local.storage
+          storage = local.k3sserver.storage
         }
       }
     }
diff --git a/infra/terraform/main.tf b/infra/terraform/main.tf
index b7c2a05..685ce1e 100644
--- a/infra/terraform/main.tf
+++ b/infra/terraform/main.tf
@@ -20,59 +20,62 @@ provider "proxmox" {
 locals {
   sshkeys    = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDEphzWgwUZnvL6E5luKLt3WO0HK7Kh63arSMoNl5gmjzXyhG1DDW0OKfoIl0T+JZw/ZjQ7iii6tmSLFRk6nuYCldqe5GVcFxvTzX4/xGEioAyG0IiUGKy6s+9xzO8QXF0EtSNPH0nfHNKcCjgwWAzM+Lt6gW0Vqs+aU5ICuDiEchmvYPz+rBaVldJVTG7m3ogKJ2aIF7HU/pCPp5l0E9gMOw7s0ABijuc3KXLEWCYgL39jIST6pFH9ceRLmu8Xy5zXHAkkEEauY/e6ld0hlzLadiUD7zYJMdDcm0oRvenYcUlaUl9gS0569IpfsJsjCejuqOxCKzTHPJDOT0f9TbIqPXkGq3s9oEJGpQW+Z8g41BqRpjBCdBk+yv39bzKxlwlumDwqgx1WP8xxKavAWYNqNRG7sBhoWwtxYEOhKXoLNjBaeDRnO5OY5AQJvONWpuByyz0R/gTh4bOFVD+Y8WWlKbT4zfhnN70XvapRsbZiaGhJBPwByAMGg6XxSbC6xtbyligVGCEjCXbTLkeKq1w0DuItY+FBGO3J2k90OiciTVSeyiVz9J/Y03UB0gHdsMCoVNrj+9QWfrTLDhM7D5YrXUt5nj2LQTcbtf49zoQXWxUhozlg42E/FJU/Yla7y55qWizAEVyP2/Ks/PHrF679k59HNd2IJ/aicA9QnmWtLQ== ansible"
   template   = "Debian12-Template"
-  storage    = "cache-domains"
-  emulatessd = true
   format     = "raw"
   dnsserver  = "192.168.12.1"
   vlan       = 12
   k3smaster = {
-    tags   = "k3s_infra"
-    count  = 3
-    name   = ["master01-infra", "master02-infra", "master03-infra"]
-    cores  = 2
-    memory = "4096"
-    drive  = 20
-    node   = ["mothership", "overlord", "vanguard"]
-    ip     = ["11", "12", "13"]
+    tags       = "k3s_infra"
+    count      = 3
+    name       = ["master01-infra", "master02-infra", "master03-infra"]
+    cores      = 2
+    memory     = "4096"
+    drive      = 20
+    storage    = "cache-domains"
+    node       = ["mothership", "overlord", "vanguard"]
+    ip         = ["11", "12", "13"]
   }
   k3sserver = {
-    tags   = "k3s_infra"
-    count  = 3
-    name   = ["node01-infra", "node02-infra", "node03-infra"]
-    cores  = 4
-    memory = "8192"
-    drive  = 240
-    node   = ["mothership", "overlord", "vanguard"]
-    ip     = ["21", "22", "23"]
+    tags       = "k3s_infra"
+    count      = 3
+    name       = ["node01-infra", "node02-infra", "node03-infra"]
+    cores      = 4
+    memory     = "8192"
+    drive      = 240
+    storage    = "cache-domains"
+    node       = ["mothership", "overlord", "vanguard"]
+    ip         = ["21", "22", "23"]
   }
   haproxy = {
-    tags   = "haproxy"
-    count  = 3
-    name   = ["haproxy-01", "haproxy-02", "haproxy-03"]
-    cores  = 2
-    memory = "1024"
-    drive  = 20
-    node   = ["mothership", "overlord", "vanguard"]
-    ip     = ["31", "32", "33"]
+    tags       = "haproxy"
+    count      = 3
+    name       = ["haproxy-01", "haproxy-02", "haproxy-03"]
+    cores      = 2
+    memory     = "1024"
+    drive      = 20
+    storage    = "cache-domains"
+    node       = ["mothership", "overlord", "vanguard"]
+    ip         = ["31", "32", "33"]
   }
   postgres = {
-    tags   = "postgres"
-    count  = 3
-    name   = ["postgres-01", "postgres-02", "postgres-03"]
-    cores  = 4
-    memory = "4096"
-    drive  = 40
-    node   = ["mothership", "overlord", "vanguard"]
-    ip     = ["34", "35", "36"]
+    tags       = "postgres"
+    count      = 3
+    name       = ["postgres-01", "postgres-02", "postgres-03"]
+    cores      = 4
+    memory     = "4096"
+    drive      = 40
+    storage    = "cache-domains"
+    node       = ["mothership", "overlord", "vanguard"]
+    ip         = ["34", "35", "36"]
   }
   pihole = {
-    tags   = "pihole"
-    count  = 3
-    name   = ["pihole-01", "pihole-02", "pihole-03"]
-    cores  = 2
-    memory = "2048"
-    drive  = 20
-    node   = ["mothership", "overlord", "vanguard"]
-    ip     = ["41", "42", "43"]
+    tags       = "pihole"
+    count      = 3
+    name       = ["pihole-01", "pihole-02", "pihole-03"]
+    cores      = 2
+    memory     = "2048"
+    drive      = 20
+    storage    = "cache-domains"
+    node       = ["mothership", "overlord", "vanguard"]
+    ip         = ["41", "42", "43"]
   }
 }
diff --git a/infra/terraform/pihole.tf b/infra/terraform/pihole.tf
index faeda60..ced2aac 100644
--- a/infra/terraform/pihole.tf
+++ b/infra/terraform/pihole.tf
@@ -30,7 +30,7 @@ resource "proxmox_vm_qemu" "pihole" {
     ide {
       ide2 {
         cloudinit {
-          storage = local.storage
+          storage = local.pihole.storage
         }
       }
     }
@@ -39,7 +39,7 @@ resource "proxmox_vm_qemu" "pihole" {
         disk {
           size    = local.pihole.drive
           format  = local.format
-          storage = local.storage
+          storage = local.pihole.storage
         }
       }
     }
diff --git a/infra/terraform/postgres.tf b/infra/terraform/postgres.tf
index 5bbf658..8a44728 100644
--- a/infra/terraform/postgres.tf
+++ b/infra/terraform/postgres.tf
@@ -30,7 +30,7 @@ resource "proxmox_vm_qemu" "haproxy" {
     ide {
       ide2 {
         cloudinit {
-          storage = local.storage
+          storage = local.haproxy.storage
         }
       }
     }
@@ -39,7 +39,7 @@ resource "proxmox_vm_qemu" "haproxy" {
         disk {
           size    = local.haproxy.drive
           format  = local.format
-          storage = local.storage
+          storage = local.haproxy.storage
         }
       }
     }