diff --git a/vpc-interface-endpoint/outputs.tf b/vpc-interface-endpoint/outputs.tf
index 9aff205..0475f3a 100644
--- a/vpc-interface-endpoint/outputs.tf
+++ b/vpc-interface-endpoint/outputs.tf
@@ -12,7 +12,8 @@ output "vpce_service_info" {
     "dns_entry"               = aws_vpc_endpoint.interface_endpoint.dns_entry,
     "subnet_ids"              = aws_vpc_endpoint.interface_endpoint.subnet_ids,
     "network_interface_ids"   = aws_vpc_endpoint.interface_endpoint.network_interface_ids,
-    "subnet_interface_id_map" = zipmap(tolist(aws_vpc_endpoint.interface_endpoint.subnet_ids), tolist(aws_vpc_endpoint.interface_endpoint.network_interface_ids)),
-    "subnet_interface_ip_map" = zipmap(tolist(aws_vpc_endpoint.interface_endpoint.subnet_ids), [for k, v in data.aws_network_interface.vpce_interfaces : v.private_ip]),
+    "subnet_interface_id_map" = { for k, v in data.aws_network_interface.vpce_interfaces : v.subnet_id => k }
+    #    "subnet_interface_id_map" = zipmap(tolist(aws_vpc_endpoint.interface_endpoint.subnet_ids), tolist(aws_vpc_endpoint.interface_endpoint.network_interface_ids)),
+    "subnet_interface_ip_map" = { for k, v in data.aws_network_interface.vpce_interfaces : v.subnet_id => v.private_ip }
   }
 }