diff --git a/aws/infrastructure.tf b/aws/infrastructure.tf
index 27884ade..47471195 100644
--- a/aws/infrastructure.tf
+++ b/aws/infrastructure.tf
@@ -219,7 +219,7 @@ locals {
         ram  = data.aws_ec2_instance_type.instance_type[values.prefix].memory_size
         gpus = try(one(data.aws_ec2_instance_type.instance_type[values.prefix].gpus).count, 0)
       }, values.specs)
-      volumes = contains(keys(module.design.volume_per_instance), x) ? {
+      volumes = {
         for pv_key, pv_values in var.volumes :
         pv_key => {
           for name, specs in pv_values :
@@ -228,7 +228,7 @@ locals {
             specs,
           )
         } if contains(values.tags, pv_key)
-      } : {}
+      }
     }
   }
 
diff --git a/azure/infrastructure.tf b/azure/infrastructure.tf
index d97d2471..1686592d 100644
--- a/azure/infrastructure.tf
+++ b/azure/infrastructure.tf
@@ -176,7 +176,7 @@ locals {
         ram  = local.vmsizes[values.type].ram
         gpus = local.vmsizes[values.type].gpus
       }, values.specs)
-      volumes = contains(keys(module.design.volume_per_instance), x) ? {
+      volumes = {
         for pv_key, pv_values in var.volumes :
         pv_key => {
           for name, specs in pv_values :
@@ -185,7 +185,7 @@ locals {
             specs,
           )
         } if contains(values.tags, pv_key)
-      } : {}
+      }
     }
   }
 
diff --git a/gcp/infrastructure.tf b/gcp/infrastructure.tf
index 0176d63f..3220e96b 100644
--- a/gcp/infrastructure.tf
+++ b/gcp/infrastructure.tf
@@ -182,7 +182,7 @@ locals {
         ram  = data.external.machine_type[values["prefix"]].result["ram"]
         gpus = try(data.external.machine_type[values["prefix"]].result["gpus"], 0)
       }, values.specs)
-      volumes = contains(keys(module.design.volume_per_instance), x) ? {
+      volumes = {
         for pv_key, pv_values in var.volumes :
         pv_key => {
           for name, specs in pv_values :
@@ -191,7 +191,7 @@ locals {
             specs,
           )
         } if contains(values.tags, pv_key)
-      } : {}
+      }
     }
   }
 
diff --git a/openstack/infrastructure.tf b/openstack/infrastructure.tf
index 3524b661..07deb3e3 100644
--- a/openstack/infrastructure.tf
+++ b/openstack/infrastructure.tf
@@ -143,7 +143,7 @@ locals {
           parseint(split(":", lookup(data.openstack_compute_flavor_v2.flavors[values.type].extra_specs, "pci_passthrough:alias", "gpu:0"))[1], 10)
         ])
       }, values.specs)
-      volumes = contains(keys(module.design.volume_per_instance), x) ? {
+      volumes = {
         for pv_key, pv_values in var.volumes :
         pv_key => {
           for name, specs in pv_values :
@@ -152,7 +152,7 @@ locals {
             specs,
           )
         } if contains(values.tags, pv_key)
-      } : {}
+      }
     }
   }