diff --git a/roles/main_infra/files/hosts.tf b/roles/main_infra/files/hosts.tf
index 4c641a9..5a9c35a 100644
--- a/roles/main_infra/files/hosts.tf
+++ b/roles/main_infra/files/hosts.tf
@@ -84,7 +84,7 @@ resource "aws_autoscaling_group" "explorer" {
 
   tag {
     key                 = "chain"
-    value               = "${element(keys(var.chains),count.index)}"
+    value               = "${element(var.chains,count.index)}"
     propagate_at_launch = true
   }
 }
diff --git a/roles/main_infra/files/outputs.tf b/roles/main_infra/files/outputs.tf
index fe27065..760f648 100644
--- a/roles/main_infra/files/outputs.tf
+++ b/roles/main_infra/files/outputs.tf
@@ -25,7 +25,7 @@ To deploy a new version of the application manually:
 
     4) Once the deployment is complete, you can access each chain explorer from its respective url:
 
-        - ${join("\n        - ", formatlist("%s: %s", keys(zipmap(keys(var.chains), aws_lb.explorer.*.dns_name)), values(zipmap(keys(var.chains), aws_lb.explorer.*.dns_name))))}
+        - ${join("\n        - ", formatlist("%s: %s", keys(zipmap(var.chains, aws_lb.explorer.*.dns_name)), values(zipmap(var.chains, aws_lb.explorer.*.dns_name))))}
 OUTPUT
 }
 
diff --git a/roles/main_infra/files/rds.tf b/roles/main_infra/files/rds.tf
index 1390bfc..92a72ba 100644
--- a/roles/main_infra/files/rds.tf
+++ b/roles/main_infra/files/rds.tf
@@ -1,27 +1,27 @@
 resource "aws_ssm_parameter" "db_host" {
   count = "${length(var.chains)}"
-  name  = "/${var.prefix}/${element(keys(var.chains),count.index)}/db_host"
+  name  = "/${var.prefix}/${element(var.chains,count.index)}/db_host"
   value = "${aws_route53_record.db.*.fqdn[count.index]}"
   type  = "String"
 }
 
 resource "aws_db_instance" "default" {
   count                  = "${length(var.chains)}"
-  name                   = "${lookup(var.chain_db_name,element(keys(var.chains),count.index))}"
-  identifier             = "${var.prefix}-${lookup(var.chain_db_id,element(keys(var.chains),count.index))}"
+  name                   = "${lookup(var.chain_db_name,element(var.chains,count.index))}"
+  identifier             = "${var.prefix}-${lookup(var.chain_db_id,element(var.chains,count.index))}"
   engine                 = "postgres"
-  engine_version         = "${lookup(var.chain_db_version,element(keys(var.chains),count.index))}"
-  instance_class         = "${lookup(var.chain_db_instance_class,element(keys(var.chains),count.index))}"
-  storage_type           = "${lookup(var.chain_db_storage_type,element(keys(var.chains),count.index))}"
-  allocated_storage      = "${lookup(var.chain_db_storage,element(keys(var.chains),count.index))}"
+  engine_version         = "${lookup(var.chain_db_version,element(var.chains,count.index))}"
+  instance_class         = "${lookup(var.chain_db_instance_class,element(var.chains,count.index))}"
+  storage_type           = "${lookup(var.chain_db_storage_type,element(var.chains,count.index))}"
+  allocated_storage      = "${lookup(var.chain_db_storage,element(var.chains,count.index))}"
   copy_tags_to_snapshot  = true
   skip_final_snapshot    = true
-  username               = "${lookup(var.chain_db_username,element(keys(var.chains),count.index))}"
-  password               = "${lookup(var.chain_db_password,element(keys(var.chains),count.index))}"
+  username               = "${lookup(var.chain_db_username,element(var.chains,count.index))}"
+  password               = "${lookup(var.chain_db_password,element(var.chains,count.index))}"
   vpc_security_group_ids = ["${aws_security_group.database.id}"]
   db_subnet_group_name   = "${aws_db_subnet_group.database.id}"
   apply_immediately      = true
-  iops                   = "${lookup(var.chain_db_iops,element(keys(var.chains),count.index),"0")}"
+  iops                   = "${lookup(var.chain_db_iops,element(var.chains,count.index),"0")}"
 
 
   depends_on = ["aws_security_group.database"]
diff --git a/roles/main_infra/files/routing.tf b/roles/main_infra/files/routing.tf
index e9fcc55..a56d412 100644
--- a/roles/main_infra/files/routing.tf
+++ b/roles/main_infra/files/routing.tf
@@ -18,7 +18,7 @@ resource "aws_route" "internet_access" {
 # The ALB for the app server
 resource "aws_lb" "explorer" {
   count              = "${length(var.chains)}"
-  name               = "${var.prefix}-explorer-${element(keys(var.chains),count.index)}-alb"
+  name               = "${var.prefix}-explorer-${element(var.chains,count.index)}-alb"
   internal           = false
   load_balancer_type = "application"
   security_groups    = ["${aws_security_group.alb.id}"]
@@ -35,7 +35,7 @@ resource "aws_lb" "explorer" {
 # The Target Group for the ALB
 resource "aws_lb_target_group" "explorer" {
   count    = "${length(var.chains)}"
-  name     = "${var.prefix}-explorer-${element(keys(var.chains),count.index)}-alb-target"
+  name     = "${var.prefix}-explorer-${element(var.chains,count.index)}-alb-target"
   port     = 4000  
   protocol = "HTTP"  
   vpc_id   = "${aws_vpc.vpc.id}"