diff --git a/common/availabilty_zones.tf b/common/availabilty_zones.tf
index fdf50d3..ee62075 100644
--- a/common/availabilty_zones.tf
+++ b/common/availabilty_zones.tf
@@ -9,22 +9,22 @@ data "aws_availability_zones" "zones" {
 }
 
 data "aws_availability_zone" "zone" {
-  count = length(data.aws_availability_zones.zones.names)
-  state = "available"
-  name  = data.aws_availability_zones.zones.names[count.index]
+  for_each = toset(sort(data.aws_availability_zones.zones.names))
+  state    = "available"
+  name     = each.key
 }
 
 output "availability_zone_names" {
   description = "VPC Availability zone name list (3)"
-  value       = data.aws_availability_zones.zones.names
+  value       = [for k, v in data.aws_availability_zone.zone : k]
 }
 
 output "availability_zone_ids" {
   description = "VPC Availability zone id list (3)"
-  value       = data.aws_availability_zones.zones.zone_ids
+  value       = [for k, v in data.aws_availability_zone.zone : v.zone_id]
 }
 
 output "availability_zone_suffixes" {
   description = "VPC Availability zone suffix list (3)"
-  value       = data.aws_availability_zone.zone[*].name_suffix
+  value       = [for k, v in data.aws_availability_zone.zone : v.name_suffix]
 }