diff --git a/ohpc-instance/main.tf b/ohpc-instance/main.tf
index a8e26f3737d365069da8af047808514601d8add8..5420d4e454fc1201a415cdb607748a01ea3f7bfd 100644
--- a/ohpc-instance/main.tf
+++ b/ohpc-instance/main.tf
@@ -76,13 +76,16 @@ resource "openstack_compute_floatingip_associate_v2" "ohpc" {
   instance_id = openstack_compute_instance_v2.ohpc.id
 }
 
-# Attach volumes
-resource "openstack_compute_volume_attach_v2" "volume_attach" {
-  count       = length(var.vol_ids)
+# Attach specific volumes
+resource "openstack_compute_volume_attach_v2" "attach_prod_volume" {
   instance_id = openstack_compute_instance_v2.ohpc.id
-  volume_id   = var.vol_ids[count.index]
+  volume_id   = var.prod_volume_id
 }
 
+resource "openstack_compute_volume_attach_v2" "attach_prod_queue_volume" {
+  instance_id = openstack_compute_instance_v2.ohpc.id
+  volume_id   = var.prod_queue_volume_id
+}
 output "xdmod_instance_id" {
   value = openstack_compute_instance_v2.ohpc.id
 }
@@ -93,7 +96,7 @@ output "ssh_host" {
 
 output "device" {
   value = [
-    openstack_compute_volume_attach_v2.volume_attach[0].device,
-    openstack_compute_volume_attach_v2.volume_attach[1].device,
+    openstack_compute_volume_attach_v2.attach_prod_volume.device,
+    openstack_compute_volume_attach_v2.attach_prod_queue_volume.device
   ]
 }