diff --git a/ohpc-instance/main.tf b/ohpc-instance/main.tf
index c6e428d56b2a820d71b097c643da1d9714007c46..f7825e8874aeddbfb2e6082039ba7f2070f62184 100644
--- a/ohpc-instance/main.tf
+++ b/ohpc-instance/main.tf
@@ -9,7 +9,6 @@ required_version = ">= 0.14.0"
   }
 }
 
-
 variable "ohpc_instance_name" {}
 variable "image_ohpc" {}
 variable "flavor" {}
@@ -76,16 +75,13 @@ resource "openstack_compute_floatingip_associate_v2" "ohpc" {
   instance_id = openstack_compute_instance_v2.ohpc.id
 }
 
-# Attach specific volumes
-resource "openstack_compute_volume_attach_v2" "attach_prod_volume" {
+# Attach volumes
+resource "openstack_compute_volume_attach_v2" "volume_attach" {
+  count       = length(var.vol_ids)
   instance_id = openstack_compute_instance_v2.ohpc.id
-  volume_id   = var.data_volume
+  volume_id   = var.vol_ids[count.index]
 }
 
-resource "openstack_compute_volume_attach_v2" "attach_prod_queue_volume" {
-  instance_id = openstack_compute_instance_v2.ohpc.id
-  volume_id   = var.prod_volume_id
-}
 output "xdmod_instance_id" {
   value = openstack_compute_instance_v2.ohpc.id
 }
@@ -96,7 +92,8 @@ output "ssh_host" {
 
 output "device" {
   value = [
-    openstack_compute_volume_attach_v2.attach_prod_volume.device,
-    openstack_compute_volume_attach_v2.attach_prod_queue_volume.device
+    openstack_compute_volume_attach_v2.volume_attach[0].device,
+    openstack_compute_volume_attach_v2.volume_attach[1].device,
   ]
 }
+