diff --git a/outputs.tf b/outputs.tf
index d193b753..9faa17fd 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -18,13 +18,13 @@ output "vsi_security_group" {
 output "list" {
   description = "A list of VSI with name, id, zone, and primary ipv4 address"
   value = [
-    for virtual_server in ibm_is_instance.vsi :
+    for vsi_key, virtual_server in ibm_is_instance.vsi :
     {
       name         = virtual_server.name
       id           = virtual_server.id
       zone         = virtual_server.zone
       ipv4_address = virtual_server.primary_network_interface[0].primary_ipv4_address
-      floating_ip  = var.enable_floating_ip ? ibm_is_floating_ip.vsi_fip[virtual_server.name].address : null
+      floating_ip  = var.enable_floating_ip ? ibm_is_floating_ip.vsi_fip[vsi_key].address : null
       vpc_id       = var.vpc_id
     }
   ]
@@ -33,13 +33,13 @@ output "list" {
 output "fip_list" {
   description = "A list of VSI with name, id, zone, and primary ipv4 address, and floating IP. This list only contains instances with a floating IP attached."
   value = [
-    for virtual_server in ibm_is_instance.vsi :
+    for vsi_key, virtual_server in ibm_is_instance.vsi :
     {
       name         = virtual_server.name
       id           = virtual_server.id
       zone         = virtual_server.zone
       ipv4_address = virtual_server.primary_network_interface[0].primary_ipv4_address
-      floating_ip  = var.enable_floating_ip ? ibm_is_floating_ip.vsi_fip[virtual_server.name].address : null
+      floating_ip  = var.enable_floating_ip ? ibm_is_floating_ip.vsi_fip[vsi_key].address : null
       vpc_id       = var.vpc_id
     } if var.enable_floating_ip == true
   ]