diff --git a/ohpc-instance/main.tf b/ohpc-instance/main.tf
index af25b348a70a29e786de5dfbbefa141c51f30e85..7ce5fba287ea6de2b9db0f45a069b207a6d52f15 100644
--- a/ohpc-instance/main.tf
+++ b/ohpc-instance/main.tf
@@ -64,7 +64,7 @@ resource "openstack_compute_floatingip_associate_v2" "ohpc" {
   instance_id = openstack_compute_instance_v2.ohpc.id
 }
 
-# Attach a volume
+# Attach volumes
 resource "openstack_compute_volume_attach_v2" "volume_attach" {
   count       = length(var.vol_ids)
   instance_id = openstack_compute_instance_v2.ohpc.id
@@ -72,7 +72,7 @@ resource "openstack_compute_volume_attach_v2" "volume_attach" {
 }
 
 output "xdmod_instance_id" {
-    value = openstack_compute_instance_v2.ohpc[count.index].id
+  value = [for instance in openstack_compute_instance_v2.ohpc : instance.id]
 }
 
 output "ssh_host" {
@@ -80,5 +80,5 @@ output "ssh_host" {
 }
 
 output "device" {
-    value = openstack_compute_volume_attach_v2.volume_attach[count.index].device
+  value = [for volume in openstack_compute_volume_attach_v2.volume_attach : volume.device]
 }