diff --git a/terraform/data.tf b/terraform/data.tf
index 8b701ce46fb07704675bf028624e7dc1dca257ca..a9a60a5f71c7186558116dc51d221c1f1df644e7 100644
--- a/terraform/data.tf
+++ b/terraform/data.tf
@@ -26,33 +26,38 @@ data "vsphere_virtual_machine" "ubuntu2204-cloud-init" {
 
 # * Datastores
 
-data "vsphere_datastore_cluster" "SCH-Cluster-FujiStorage" {
-  name          = "SCH-Cluster-FujiStorage"
-  datacenter_id = data.vsphere_datacenter.dc.id
-}
+# data "vsphere_datastore_cluster" "SCH-Cluster-FujiStorage" {
+#   name          = "SCH-Cluster-FujiStorage"
+#   datacenter_id = data.vsphere_datacenter.dc.id
+# }
 
-data "vsphere_datastore" "Memory-Blitzkrieg" {
-  name          = "Memory-Blitzkrieg"
-  datacenter_id = data.vsphere_datacenter.dc.id
-}
+# data "vsphere_datastore" "Memory-Blitzkrieg" {
+#   name          = "Memory-Blitzkrieg"
+#   datacenter_id = data.vsphere_datacenter.dc.id
+# }
 
-data "vsphere_datastore" "N1_SSD-01" {
-  name          = "N1_SSD-01"
-  datacenter_id = data.vsphere_datacenter.dc.id
-}
-data "vsphere_datastore" "N2_SSD-01" {
-  name          = "N2_SSD-01"
-  datacenter_id = data.vsphere_datacenter.dc.id
-}
-data "vsphere_datastore" "N3_SSD-01" {
-  name          = "N3_SSD-01"
-  datacenter_id = data.vsphere_datacenter.dc.id
-}
-data "vsphere_datastore" "N4_SSD-01" {
-  name          = "N4_SSD-01"
+data "vsphere_datastore" "Linstor" {
+  name          = "Linstor"
   datacenter_id = data.vsphere_datacenter.dc.id
 }
 
+# data "vsphere_datastore" "N1_SSD-01" {
+#   name          = "N1_SSD-01"
+#   datacenter_id = data.vsphere_datacenter.dc.id
+# }
+# data "vsphere_datastore" "N2_SSD-01" {
+#   name          = "N2_SSD-01"
+#   datacenter_id = data.vsphere_datacenter.dc.id
+# }
+# data "vsphere_datastore" "N3_SSD-01" {
+#   name          = "N3_SSD-01"
+#   datacenter_id = data.vsphere_datacenter.dc.id
+# }
+# data "vsphere_datastore" "N4_SSD-01" {
+#   name          = "N4_SSD-01"
+#   datacenter_id = data.vsphere_datacenter.dc.id
+# }
+
 # * Network
 
 data "vsphere_network" "dvPG-AdminLAN-native" {
diff --git a/terraform/main.tf b/terraform/main.tf
index 03a62240008a06e0710e04f3a71fedbc3818b33a..e7b5237fc7c7658b0ef42aed075d37c4c9329725 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -4,7 +4,7 @@ locals {
       num_cpus             = 2
       memory               = 1024
       template_uuid        = data.vsphere_virtual_machine.ubuntu2204-cloud-init.id
-      datastore_cluster_id = data.vsphere_datastore_cluster.SCH-Cluster-FujiStorage.id
+      datastore_id = data.vsphere_datastore.Linstor.id
       vapp_properties = {
         public-keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKZ15FeW63PG1M1JnnBUzTrXoVPcn+3YSKKFMfksCXsF ubuntu@k8s-02"
         user-data   = base64encode(file("${path.module}/cloud-init/k8s-02-mgmt.yaml"))
@@ -27,7 +27,7 @@ locals {
       num_cpus             = 2
       memory               = 5120
       template_uuid        = data.vsphere_virtual_machine.ubuntu2204-cloud-init.id
-      datastore_cluster_id = data.vsphere_datastore_cluster.SCH-Cluster-FujiStorage.id
+      datastore_id = data.vsphere_datastore.Linstor.id
       vapp_properties = {
         public-keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKZ15FeW63PG1M1JnnBUzTrXoVPcn+3YSKKFMfksCXsF ubuntu@k8s-02"
         user-data   = base64encode(data.template_file.kube["master-01-k8s-02"].rendered)
@@ -51,7 +51,7 @@ locals {
       num_cpus             = 2
       memory               = 5120
       template_uuid        = data.vsphere_virtual_machine.ubuntu2204-cloud-init.id
-      datastore_cluster_id = data.vsphere_datastore_cluster.SCH-Cluster-FujiStorage.id
+      datastore_id = data.vsphere_datastore.Linstor.id
       vapp_properties = {
         public-keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKZ15FeW63PG1M1JnnBUzTrXoVPcn+3YSKKFMfksCXsF ubuntu@k8s-02"
         user-data   = base64encode(data.template_file.kube["master-02-k8s-02"].rendered)
@@ -75,7 +75,7 @@ locals {
       num_cpus             = 2
       memory               = 5120
       template_uuid        = data.vsphere_virtual_machine.ubuntu2204-cloud-init.id
-      datastore_cluster_id = data.vsphere_datastore_cluster.SCH-Cluster-FujiStorage.id
+      datastore_id = data.vsphere_datastore.Linstor.id
       vapp_properties = {
         public-keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKZ15FeW63PG1M1JnnBUzTrXoVPcn+3YSKKFMfksCXsF ubuntu@k8s-02"
         user-data   = base64encode(data.template_file.kube["master-03-k8s-02"].rendered)
@@ -99,13 +99,14 @@ locals {
       num_cpus             = 4
       memory               = 12288
       template_uuid        = data.vsphere_virtual_machine.ubuntu2204-cloud-init.id
-      datastore_cluster_id = data.vsphere_datastore_cluster.SCH-Cluster-FujiStorage.id
+      datastore_id = data.vsphere_datastore.Linstor.id
       vapp_properties = {
         public-keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKZ15FeW63PG1M1JnnBUzTrXoVPcn+3YSKKFMfksCXsF ubuntu@k8s-02"
         user-data   = base64encode(data.template_file.kube["worker-01-k8s-02"].rendered)
       }
       disk_map = {
         0 = { size = 70 }
+        1 = { size = 250 }
       }
       enable_disk_uuid = true
       network_interface_map = {
@@ -123,13 +124,14 @@ locals {
       num_cpus             = 4
       memory               = 12288
       template_uuid        = data.vsphere_virtual_machine.ubuntu2204-cloud-init.id
-      datastore_cluster_id = data.vsphere_datastore_cluster.SCH-Cluster-FujiStorage.id
+      datastore_id = data.vsphere_datastore.Linstor.id
       vapp_properties = {
         public-keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKZ15FeW63PG1M1JnnBUzTrXoVPcn+3YSKKFMfksCXsF ubuntu@k8s-02"
         user-data   = base64encode(data.template_file.kube["worker-02-k8s-02"].rendered)
       }
       disk_map = {
         0 = { size = 70 }
+        1 = { size = 250 }
       }
       enable_disk_uuid = true
       network_interface_map = {
@@ -147,13 +149,14 @@ locals {
       num_cpus             = 4
       memory               = 12288
       template_uuid        = data.vsphere_virtual_machine.ubuntu2204-cloud-init.id
-      datastore_cluster_id = data.vsphere_datastore_cluster.SCH-Cluster-FujiStorage.id
+      datastore_id = data.vsphere_datastore.Linstor.id
       vapp_properties = {
         public-keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKZ15FeW63PG1M1JnnBUzTrXoVPcn+3YSKKFMfksCXsF ubuntu@k8s-02"
         user-data   = base64encode(data.template_file.kube["worker-03-k8s-02"].rendered)
       }
       disk_map = {
         0 = { size = 70 }
+        1 = { size = 250 }
       }
       enable_disk_uuid = true
       network_interface_map = {
@@ -171,13 +174,14 @@ locals {
       num_cpus             = 4
       memory               = 12288
       template_uuid        = data.vsphere_virtual_machine.ubuntu2204-cloud-init.id
-      datastore_cluster_id = data.vsphere_datastore_cluster.SCH-Cluster-FujiStorage.id
+      datastore_id = data.vsphere_datastore.Linstor.id
       vapp_properties = {
         public-keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKZ15FeW63PG1M1JnnBUzTrXoVPcn+3YSKKFMfksCXsF ubuntu@k8s-02"
         user-data   = base64encode(data.template_file.kube["worker-04-k8s-02"].rendered)
       }
       disk_map = {
         0 = { size = 70 }
+        1 = { size = 250 }
       }
       enable_disk_uuid = true
       network_interface_map = {