diff --git a/outputs.tf b/outputs.tf
index e95e026..7cd368f 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -51,13 +51,11 @@ output "route_table_ids_private" {
 }
 
 output "nat_eip_id" {
-  # value       = concat(values(aws_eip.quortex[*].allocation_id), values({ for k, v in var.nat_gateways : k => v if v.eip_allocation_id != null }[*].eip_allocation_id))
-  value       = values(aws_eip.quortex[*].allocation_id)
+  value       = concat(values(aws_eip.quortex)[*].allocation_id, [ for k, v in var.nat_gateways : v.eip_allocation_id if v.eip_allocation_id != null])
   description = "The IDs of the Elastic IPs associated to the Quortex cluster External NAT Gateways."
 }
 
 output "nat_eip_address" {
-  #value       = concat(values(aws_eip.quortex[*].public_ip), values(data.aws_eip.existing_eip[*].public_ip))
-  value       = values(aws_eip.quortex[*].public_ip)
+  value       = concat(values(aws_eip.quortex)[*].public_ip, values(data.aws_eip.existing_eip)[*].public_ip)
   description = "The public addresses of the Elastic IP associated to the Quortex cluster External NAT Gateways."
 }