diff --git a/terraform/modules/infrastructure/assets/network/gateways.tf b/terraform/modules/infrastructure/assets/network/gateways.tf
index abc7ec8..5e87439 100644
--- a/terraform/modules/infrastructure/assets/network/gateways.tf
+++ b/terraform/modules/infrastructure/assets/network/gateways.tf
@@ -1,13 +1,13 @@
 resource "aws_internet_gateway" "gw" {
-  vpc_id = "${aws_vpc.main.id}"
+  vpc_id = aws_vpc.main.id
 }
 
 resource "aws_nat_gateway" "nat-a" {
-  allocation_id = "${aws_eip.nat-a.id}"
-  subnet_id     = "${aws_subnet.attacker_subnet.id}"
+  allocation_id = aws_eip.nat-a.id
+  subnet_id     = aws_subnet.attacker_subnet.id
 }
 
 resource "aws_nat_gateway" "nat-b" {
-  allocation_id = "${aws_eip.nat-b.id}"
-  subnet_id     = "${aws_subnet.target_subnet.id}"
+  allocation_id = aws_eip.nat-b.id
+  subnet_id     = aws_subnet.target_subnet.id
 }
diff --git a/terraform/modules/infrastructure/assets/network/routes.tf b/terraform/modules/infrastructure/assets/network/routes.tf
index c7a308e..f2bd9d9 100644
--- a/terraform/modules/infrastructure/assets/network/routes.tf
+++ b/terraform/modules/infrastructure/assets/network/routes.tf
@@ -1,9 +1,9 @@
 resource "aws_route_table" "public-a" {
-  vpc_id = "${aws_vpc.main.id}"
+  vpc_id = aws_vpc.main.id
 
   route {
     cidr_block = "0.0.0.0/0"
-    gateway_id = "${aws_internet_gateway.gw.id}"
+    gateway_id = aws_internet_gateway.gw.id
   }
 
   tags = {
@@ -13,17 +13,17 @@ resource "aws_route_table" "public-a" {
 }
 
 resource "aws_route_table_association" "public-a" {
-  subnet_id      = "${aws_subnet.attacker_subnet.id}"
-  route_table_id = "${aws_route_table.public-a.id}"
+  subnet_id      = aws_subnet.attacker_subnet.id
+  route_table_id = aws_route_table.public-a.id
 }
 
 
 resource "aws_route_table" "public-b" {
-  vpc_id = "${aws_vpc.main.id}"
+  vpc_id = aws_vpc.main.id
 
   route {
     cidr_block = "0.0.0.0/0"
-    gateway_id = "${aws_internet_gateway.gw.id}"
+    gateway_id = aws_internet_gateway.gw.id
   }
 
   tags = {
@@ -33,16 +33,16 @@ resource "aws_route_table" "public-b" {
 }
 
 resource "aws_route_table_association" "public-b" {
-  subnet_id      = "${aws_subnet.target_subnet.id}"
-  route_table_id = "${aws_route_table.public-b.id}"
+  subnet_id      = aws_subnet.target_subnet.id
+  route_table_id = aws_route_table.public-b.id
 }
 
 resource "aws_route_table" "private-a" {
-  vpc_id = "${aws_vpc.main.id}"
+  vpc_id = aws_vpc.main.id
 
   route {
     cidr_block     = "0.0.0.0/0"
-    nat_gateway_id = "${aws_nat_gateway.nat-a.id}"
+    nat_gateway_id = aws_nat_gateway.nat-a.id
   }
 
   tags = {
@@ -52,16 +52,16 @@ resource "aws_route_table" "private-a" {
 }
 
 resource "aws_route_table_association" "private-a" {
-  subnet_id      = "${aws_subnet.private-a.id}"
-  route_table_id = "${aws_route_table.private-a.id}"
+  subnet_id      = aws_subnet.private-a.id
+  route_table_id = aws_route_table.private-a.id
 }
 
 resource "aws_route_table" "private-b" {
-  vpc_id = "${aws_vpc.main.id}"
+  vpc_id = aws_vpc.main.id
 
   route {
     cidr_block     = "0.0.0.0/0"
-    nat_gateway_id = "${aws_nat_gateway.nat-b.id}"
+    nat_gateway_id = aws_nat_gateway.nat-b.id
   }
 
   tags = {
@@ -71,13 +71,13 @@ resource "aws_route_table" "private-b" {
 }
 
 resource "aws_route_table_association" "private-b" {
-  subnet_id      = "${aws_subnet.private-b.id}"
-  route_table_id = "${aws_route_table.private-b.id}"
+  subnet_id      = aws_subnet.private-b.id
+  route_table_id = aws_route_table.private-b.id
 }
 
 // public-b
 //resource "aws_route" "internet_access" {
-//  route_table_id         = "${aws_vpc.main.main_route_table_id}"
+//  route_table_id         = aws_vpc.main.main_route_table_id
 //  destination_cidr_block = "0.0.0.0/0"
-//  gateway_id             = "${aws_internet_gateway.gw.id}"
+//  gateway_id             = "aws_internet_gateway.gw.id"
 //}
\ No newline at end of file
diff --git a/terraform/modules/infrastructure/assets/network/subnets.tf b/terraform/modules/infrastructure/assets/network/subnets.tf
index 5194d61..4862837 100644
--- a/terraform/modules/infrastructure/assets/network/subnets.tf
+++ b/terraform/modules/infrastructure/assets/network/subnets.tf
@@ -1,7 +1,7 @@
 resource "aws_subnet" "attacker_subnet" {
-  vpc_id            = "${aws_vpc.main.id}"
-  cidr_block        = "${var.cidr}"
-  availability_zone = "${data.aws_availability_zones.available.names[1]}"
+  vpc_id            = aws_vpc.main.id
+  cidr_block        = var.cidr
+  availability_zone = data.aws_availability_zones.available.names[1]
   map_public_ip_on_launch = true
 
   tags = {
@@ -15,10 +15,10 @@ resource "aws_subnet" "attacker_subnet" {
 }
 
 resource "aws_subnet" "target_subnet" {
-  vpc_id                  = "${aws_vpc.main.id}"
+  vpc_id                  = aws_vpc.main.id
   cidr_block        = "192.168.39.0/24"
-  availability_zone       = "${data.aws_availability_zones.available.names[0]}"
-//  map_public_ip_on_launch = true
+  availability_zone       = data.aws_availability_zones.available.names[0]
+  map_public_ip_on_launch = false
 
   tags = {
     name        = "target_subnet"
@@ -30,10 +30,10 @@ resource "aws_subnet" "target_subnet" {
 }
 
 resource "aws_subnet" "malware_subnet" {
-  vpc_id            = "${aws_vpc.main.id}"
+  vpc_id            = aws_vpc.main.id
   cidr_block        = "192.168.40.0/24"
-  availability_zone = "${data.aws_availability_zones.available.names[1]}"
-  map_public_ip_on_launch = true
+  availability_zone = data.aws_availability_zones.available.names[1]
+  map_public_ip_on_launch = false
 
   tags = {
     name        = "malware_subnet"
@@ -46,10 +46,10 @@ resource "aws_subnet" "malware_subnet" {
 }
 
 resource "aws_subnet" "honeypot_subnet" {
-  vpc_id            = "${aws_vpc.main.id}"
+  vpc_id            = aws_vpc.main.id
   cidr_block        = "192.168.41.0/24"
-  availability_zone = "${data.aws_availability_zones.available.names[1]}"
-  map_public_ip_on_launch = true
+  availability_zone = data.aws_availability_zones.available.names[1]
+  map_public_ip_on_launch = false
 
   tags = {
     name        = "malware_subnet"
@@ -62,9 +62,9 @@ resource "aws_subnet" "honeypot_subnet" {
 }
 
 resource "aws_subnet" "private-a" {
-  vpc_id            = "${aws_vpc.main.id}"
+  vpc_id            = aws_vpc.main.id
   cidr_block        = "192.168.42.0/24"
-  availability_zone = "${data.aws_availability_zones.available.names[0]}"
+  availability_zone = data.aws_availability_zones.available.names[0]
 
   tags = {
     name        = "not-in-use-private-a"
@@ -77,9 +77,9 @@ resource "aws_subnet" "private-a" {
 }
 
 resource "aws_subnet" "private-b" {
-  vpc_id            = "${aws_vpc.main.id}"
+  vpc_id            = aws_vpc.main.id
   cidr_block        = "192.168.43.0/24"
-  availability_zone = "${data.aws_availability_zones.available.names[1]}"
+  availability_zone = data.aws_availability_zones.available.names[1]
 
   tags = {
     name        = "not-in-use-private-b"
diff --git a/terraform/modules/infrastructure/assets/secdevops/attackers.tf b/terraform/modules/infrastructure/assets/secdevops/attackers.tf
index ffa7056..482d297 100644
--- a/terraform/modules/infrastructure/assets/secdevops/attackers.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/attackers.tf
@@ -6,13 +6,13 @@ locals {
 }
 
 resource "aws_instance" "kali" {
-  count = "${var.kali_ct}"
-  ami = "${data.aws_ami.kali.id}"
-  instance_type = "${var.instance_type_kali}"
-  subnet_id              = "${element(local.pen_subnet_ids, count.index)}"
+  count = var.kali_ct
+  ami = data.aws_ami.kali.id
+  instance_type = var.instance_type_kali
+  subnet_id              = element(local.pen_subnet_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.kali.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
-  user_data = "${file("../../modules/infrastructure/cloud-init/kali.yml")}"
+  key_name = aws_key_pair.circleci_key.key_name
+  user_data = file("../../modules/infrastructure/cloud-init/kali.yml")
 
   root_block_device {
     delete_on_termination = true
@@ -26,12 +26,12 @@ resource "aws_instance" "kali" {
 }
 
 resource "aws_instance" "commando" {
-  count = "${var.docker_ct}"
-  ami = "${data.aws_ami.commando.id}"
-  instance_type = "${var.instance_type_win}"
-  subnet_id              = "${element(local.pen_subnet_ids, count.index)}"
+  count = var.docker_ct
+  ami = data.aws_ami.commando.id
+  instance_type = var.instance_type_win
+  subnet_id              = element(local.pen_subnet_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.windows.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
 
   root_block_device {
     delete_on_termination = true
@@ -45,14 +45,14 @@ resource "aws_instance" "commando" {
 }
 
 resource "aws_instance" "r7vm" {
-  count = "${var.kali_ct}"
+  count = var.kali_ct
 
-  ami = "${data.aws_ami.r7.id}"
-  instance_type = "${var.instance_type_kali}"
+  ami = data.aws_ami.r7.id
+  instance_type = var.instance_type_kali
 
-  subnet_id              = "${element(local.pen_subnet_ids, count.index)}"
+  subnet_id              = element(local.pen_subnet_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.kali.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
 
   root_block_device {
     delete_on_termination = true
@@ -67,12 +67,12 @@ resource "aws_instance" "r7vm" {
 }
 
 resource "aws_instance" "commandov2" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.commandov2.id}"
-  instance_type = "${var.instance_type_commandov2}"
-  subnet_id              = "${element(local.pen_subnet_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.commandov2.id
+  instance_type = var.instance_type_commandov2
+  subnet_id              = element(local.pen_subnet_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.kali.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
     volume_size           = 160
diff --git a/terraform/modules/infrastructure/assets/secdevops/aws_key_pairs.tf b/terraform/modules/infrastructure/assets/secdevops/aws_key_pairs.tf
index f3e145f..e114344 100644
--- a/terraform/modules/infrastructure/assets/secdevops/aws_key_pairs.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/aws_key_pairs.tf
@@ -1,4 +1,4 @@
 resource "aws_key_pair" "circleci_key" {
   key_name   = "v2"
-  public_key = "${file("../../keys/circleci_terraform.pub")}"
+  public_key = file("../../keys/circleci_terraform.pub")
 }
diff --git a/terraform/modules/infrastructure/assets/secdevops/ctf.playground.tf b/terraform/modules/infrastructure/assets/secdevops/ctf.playground.tf
index ea5a96f..6b971d6 100644
--- a/terraform/modules/infrastructure/assets/secdevops/ctf.playground.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/ctf.playground.tf
@@ -1,27 +1,29 @@
 locals {
   fbctf_subnets_ids = [
-    "${var.attacker_subnet_id}",
     "${var.target_subnet_id}",
   ]
 }
 
 resource "aws_instance" "fbctf" {
-  count = "${var.fbctf_ct}"
+  count = var.fbctf_ct
 
-  ami           = "${data.aws_ami.ubuntu1604.id}"
-  instance_type = "${var.instance_type_docker}"
+  ami           = data.aws_ami.ubuntu1604.id
+  instance_type = var.instance_type_docker
 
-  subnet_id = "${element(local.fbctf_subnets_ids, count.index)}"
+  subnet_id = element(local.fbctf_subnets_ids, count.index)
 
   vpc_security_group_ids = ["${aws_security_group.fbctf.id}"]
 
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
+
+  #user_data = "${file("var.fbctf_user_data")}"
+
+
 
-  user_data = "${file("${var.fbctf_user_data}")}"
 
   root_block_device {
     volume_type = "gp2"
-    volume_size = "${var.fbctf_root_vol_size}"
+    volume_size = var.fbctf_root_vol_size
     delete_on_termination = "true"
   }
 
diff --git a/terraform/modules/infrastructure/assets/secdevops/detection.lab.tf b/terraform/modules/infrastructure/assets/secdevops/detection.lab.tf
index 43b2ce9..9616a9f 100644
--- a/terraform/modules/infrastructure/assets/secdevops/detection.lab.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/detection.lab.tf
@@ -7,12 +7,12 @@ locals {
 
 
 resource "aws_instance" "dl-wef" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.detection-wef.id}"
-  instance_type = "${var.instance_type_tpot}"
-  subnet_id              = "${element(local.cyberRange_detection_subnets_ids, count.index)}"
-  vpc_security_group_ids = ["${aws_security_group.windows.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  count = var.docker_ct
+  ami           = data.aws_ami.detection-wef.id
+  instance_type = var.instance_type_tpot
+  subnet_id              = element(local.cyberRange_detection_subnets_ids, count.index)
+  vpc_security_group_ids = [aws_security_group.windows.id]
+  key_name = aws_key_pair.circleci_key.key_name
   private_ip             = "192.168.38.103"
 
   root_block_device {
@@ -26,12 +26,12 @@ resource "aws_instance" "dl-wef" {
 }
 
 resource "aws_instance" "dl-dc" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.detection-dc.id}"
-  instance_type = "${var.instance_type_tpot}"
-  subnet_id              = "${element(local.cyberRange_detection_subnets_ids, count.index)}"
-  vpc_security_group_ids = ["${aws_security_group.windows.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  count = var.docker_ct
+  ami           = data.aws_ami.detection-dc.id
+  instance_type = var.instance_type_tpot
+  subnet_id              = element(local.cyberRange_detection_subnets_ids, count.index)
+  vpc_security_group_ids = [aws_security_group.windows.id]
+  key_name = aws_key_pair.circleci_key.key_name
   private_ip             = "192.168.38.102"
 
   root_block_device {
@@ -44,12 +44,12 @@ resource "aws_instance" "dl-dc" {
   }
 }
 resource "aws_instance" "dl-win10" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.detection-dc.id}"
-  instance_type = "${var.instance_type_tpot}"
-  subnet_id              = "${element(local.cyberRange_detection_subnets_ids, count.index)}"
-  vpc_security_group_ids = ["${aws_security_group.windows.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  count = var.docker_ct
+  ami           = data.aws_ami.detection-dc.id
+  instance_type = var.instance_type_tpot
+  subnet_id              = element(local.cyberRange_detection_subnets_ids, count.index)
+  vpc_security_group_ids = [aws_security_group.windows.id]
+  key_name = aws_key_pair.circleci_key.key_name
   private_ip             = "192.168.38.104"
 
   root_block_device {
@@ -63,17 +63,17 @@ resource "aws_instance" "dl-win10" {
 }
 
 resource "aws_instance" "dl-logger" {
-  count = "${var.docker_ct}"
-  instance_type = "${var.instance_type_tpot}"
-  ami           = "${data.aws_ami.logger_ami.image_id}"
+  count = var.docker_ct
+  instance_type = var.instance_type_tpot
+  ami           = data.aws_ami.logger_ami.image_id
 
   tags = {
     Name = "dl.logger"
   }
 
-  subnet_id              = "${element(local.cyberRange_detection_subnets_ids, count.index)}"
-  vpc_security_group_ids = ["${aws_security_group.logger.id}"]
-  key_name               = "${aws_key_pair.circleci_key.key_name}"
+  subnet_id              = element(local.cyberRange_detection_subnets_ids, count.index)
+  vpc_security_group_ids = [aws_security_group.logger.id]
+  key_name               = aws_key_pair.circleci_key.key_name
   private_ip             = "192.168.38.105"
 
 
diff --git a/terraform/modules/infrastructure/assets/secdevops/honeyPots.tf b/terraform/modules/infrastructure/assets/secdevops/honeyPots.tf
index 8434a64..8031133 100644
--- a/terraform/modules/infrastructure/assets/secdevops/honeyPots.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/honeyPots.tf
@@ -1,23 +1,22 @@
 locals {
   subnets_ids = [
-    "${var.attacker_subnet_id}",
-    "${var.target_subnet_id}",
+    "${var.honeypot_subnet_id}",
   ]
 }
 
 resource "aws_instance" "tpot-full-build" {
-  count = "${var.tpot_ct}"
+  count = var.tpot_ct
 
-  ami           = "${data.aws_ami.debianstretch.id}"
-  instance_type = "${var.instance_type_tpot}"
-  subnet_id = "${element(local.subnets_ids, count.index)}"
+  ami           = data.aws_ami.debianstretch.id
+  instance_type = var.instance_type_tpot
+  subnet_id = element(local.subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.tpot.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
-  user_data = "${file("../../modules/infrastructure/cloud-init/tpot.setup.yml")}"
+  key_name = aws_key_pair.circleci_key.key_name
+  user_data = file("../../modules/infrastructure/cloud-init/tpot.setup.yml")
 
   root_block_device {
     volume_type = "gp2"
-    volume_size = "${var.tpot_root_vol_size}"
+    volume_size = var.tpot_root_vol_size
     delete_on_termination = "true"
   }
 
@@ -30,17 +29,17 @@ resource "aws_instance" "tpot-full-build" {
 
 
 resource "aws_instance" "tpot" {
-  count = "${var.tpot_ct}"
+  count = var.tpot_ct
 
-  ami = "${data.aws_ami.tpot.id}"
-  instance_type = "${var.instance_type_tpot}"
-  subnet_id = "${element(local.subnets_ids, count.index)}"
+  ami = data.aws_ami.tpot.id
+  instance_type = var.instance_type_tpot
+  subnet_id = element(local.subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.tpot.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
 
   root_block_device {
     volume_type = "gp2"
-    volume_size = "${var.tpot_root_vol_size}"
+    volume_size = var.tpot_root_vol_size
     delete_on_termination = "true"
   }
 
diff --git a/terraform/modules/infrastructure/assets/secdevops/malware.tf b/terraform/modules/infrastructure/assets/secdevops/malware.tf
index 7678c3c..fbe7f38 100644
--- a/terraform/modules/infrastructure/assets/secdevops/malware.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/malware.tf
@@ -1,17 +1,16 @@
 locals {
   malware_subnet_ids = [
-    "${var.attacker_subnet_id}",
-    "${var.target_subnet_id}",
+    "${var.malware_subnet_id}",
   ]
 }
 
 resource "aws_instance" "flarevm-win7" {
-  count         = "${var.docker_ct}"
-  ami           = "${data.aws_ami.flare.id}"
+  count         = var.docker_ct
+  ami           = data.aws_ami.flare.id
   instance_type = "t2.xlarge"
-  subnet_id               = "${element(local.malware_subnet_ids, count.index)}"
+  subnet_id               = element(local.malware_subnet_ids, count.index)
   vpc_security_group_ids  = ["${aws_security_group.malware.id}"]
-  key_name                = "${aws_key_pair.circleci_key.key_name}"
+  key_name                = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
     volume_size           = 150
@@ -27,12 +26,12 @@ resource "aws_instance" "flarevm-win7" {
 
 
 resource "aws_instance" "cuckoo_guest" {
-  count         = "${var.docker_ct}"
-  ami           = "${data.aws_ami.win7.id}"
-  instance_type = "${var.instance_type_win}"
-  subnet_id               = "${element(local.malware_subnet_ids, count.index)}"
+  count         = var.docker_ct
+  ami           = data.aws_ami.win7.id
+  instance_type = var.instance_type_win
+  subnet_id               = element(local.malware_subnet_ids, count.index)
   vpc_security_group_ids  = ["${aws_security_group.malware.id}"]
-  key_name                = "${aws_key_pair.circleci_key.key_name}"
+  key_name                = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
     volume_size           = 150
@@ -48,11 +47,11 @@ resource "aws_instance" "cuckoo_guest" {
 }
 
 resource "aws_instance" "cuckoo-host-ubuntu" {
-  count         = "${var.docker_ct}"
-  ami = "${data.aws_ami.cuckoo-host.id}"
-  instance_type = "${var.instance_type_kali}"
-  subnet_id = "${element(local.malware_subnet_ids, count.index)}"
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  count         = var.docker_ct
+  ami = data.aws_ami.cuckoo-host.id
+  instance_type = var.instance_type_kali
+  subnet_id = element(local.malware_subnet_ids, count.index)
+  key_name = aws_key_pair.circleci_key.key_name
   vpc_security_group_ids = ["${aws_security_group.malware.id}"]
 
   tags = {
@@ -67,13 +66,13 @@ resource "aws_instance" "cuckoo-host-ubuntu" {
 
 
 resource "aws_instance" "remnux" {
-  count         = "${var.docker_ct}"
-  ami = "${data.aws_ami.remnux.id}"
-  instance_type = "${var.instance_type_kali}"
-  subnet_id = "${element(local.malware_subnet_ids, count.index)}"
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  count         = var.docker_ct
+  ami = data.aws_ami.remnux.id
+  instance_type = var.instance_type_kali
+  subnet_id = element(local.malware_subnet_ids, count.index)
+  key_name = aws_key_pair.circleci_key.key_name
   vpc_security_group_ids = ["${aws_security_group.malware.id}"]
-  user_data = "${file("../../modules/infrastructure/cloud-init/remnux.ssh.enable.yml")}"
+  user_data = file("../../modules/infrastructure/cloud-init/remnux.ssh.enable.yml")
   tags = {
     //    todo: tag standardization
     Name = "remnux-6.0"
diff --git a/terraform/modules/infrastructure/assets/secdevops/range_users.tf b/terraform/modules/infrastructure/assets/secdevops/range_users.tf
index dadb306..cb8b2b4 100644
--- a/terraform/modules/infrastructure/assets/secdevops/range_users.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/range_users.tf
@@ -11,13 +11,13 @@ resource "aws_iam_user" "cloudgoat" {
 }
 
 resource "aws_iam_access_key" "cloudgoat" {
-  user = "${aws_iam_user.cloudgoat.name}"
+  user = aws_iam_user.cloudgoat.name
 //  pgp_key    = "mQENBF2Y3n8BCAC6tFVgnQdw5KyVN01ngB8bv8r3joVNO8+/fSaOBvRF43F0M/KLtXnHqi/Wues1Y4Z/ByAJjsuTFUN2bsTVjboxWesugOPTh+HGXGB3SwXKuDlVVxD3/H9oxgB6g5lN3u1o1mdmg9FADKYYWn0/pmqwF87L4jusdNYy99ImJKYBfncuTat2ZXwND6VIMXAlvXkrpRqxL40aEY621CyPRV1gl8tLqVVWppHwd8NAQcWgQKWF7dthEqWd5svdWjkh8DCp9Wr2uieBXBs7uf4wHxD22s0MluLWjao8DEQ4SdgKhGToAngHDl0xYTgQk6teN3Pz87Af4EnIe2veJi2dEa67ABEBAAG0I3FnYXhlZXZ2IDxxZ2F4ZWV2dkBzaGFya2xhc2Vycy5jb20+iQFUBBMBCAA+FiEEiD+RXRgaYU/GYJMLeXod5qmKb3EFAl2Y3n8CGwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQeXod5qmKb3Fd/wgApZXuTsb1h5OL7RxRkebGXgzVAq2BwEtejlbLZmJ3EDWySNi+/xhMiDSLPXPto2Dzn9F5N65xT8ezw30xN/ydDcAb1C3nvTgtY/u2Lllai83Ae27hls8iZEf9FfzkeJPv5Kg0TSwfSa+WrSuZyYPBcNLhM7Iurv3qJKFDLJ1g31dJmT69mbk70uhtfhpjquU9pxu+GIC66Q2m9Mc5qUphOdzFCr9iU+mOqkRHCGnOzAgsYZySmhVYhvdILGqqHuou7GSqQEtLZ4wh9iCHjnwux9eBAdYklewP4ATzII+Ul+r49AsqTMP7wtqKCrNNpRSJUrko/Y8gdWdA+gm7GRhUjbkBDQRdmN5/AQgAvZG7t9fz8Gz/03zVu7mBqBsqS0ztxow14sfovImUBh5/Uw27fpV1MGGfz/hFBQSWSv58CnUlOOSiFUUQktsZPw+FwsMDHkF5rEzRpcBYXbLVTvajv0qE8pKlBUPsyPs+yLeH9oaVCc0wL8GDgwJVEWeOMxD+H+9hWnvrZiQ0dFgkJjSNE8rM/9mjzzLKodjGpFAKfa1IQXFz7+PUt1T4+gnMkXz8r6TvmidAhcvURg2TFBTRgS/5vMK6wZVUTN8Hfc1KePKvhgzlQpRXKL1VotykgA5VkP2lrCK+UbX+RWtlLRlizjfhSz6zNdGb3Ea/JPIcWGUZPNJ53xHddwrlKQARAQABiQE8BBgBCAAmFiEEiD+RXRgaYU/GYJMLeXod5qmKb3EFAl2Y3n8CGwwFCQPCZwAACgkQeXod5qmKb3EJaQgAr/T9p4UzcMZFfz+DD1rW0EC72lMILCZ78hclFJ7IFfBnraNvEwNP/5TvhR1XG/A1rOOdH6KrSH0Su09XyOvA/OqLlz5RM9l0J2zmbwfw1fmecYjpOg7vsTkaCr5PZjv9PLUlvoOu3YKatrd0D/x8SqdGXb9zMIJiqc36FlRI0V+tohGtln/8uFszhWl+DmBiJyBqHaeaEVkUAMRYnmD3b2EJCjlwLAn7/9kgU1EbFSj0ZJQwYg28Lr6IQIswxG0ai0iGTG/cm88fzowhNo3dOPmci4VM1iOVTF2DY9gokqks/RTADrxS0xq0CU5xmkL8l47uftuIZWqQV92kzbiLFA=="
 }
 
 resource "aws_iam_user_policy" "cloudgoat" {
   name = "cloudgoat"
-  user = "${aws_iam_user.cloudgoat.name}"
+  user = aws_iam_user.cloudgoat.name
 
   policy = <<EOF
 {
diff --git a/terraform/modules/infrastructure/assets/secdevops/security_groups.tf b/terraform/modules/infrastructure/assets/secdevops/security_groups.tf
index a26142a..b16d697 100644
--- a/terraform/modules/infrastructure/assets/secdevops/security_groups.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/security_groups.tf
@@ -1,7 +1,7 @@
 resource "aws_security_group" "tpot" {
   name        = "T-Pot"
   description = "T-Pot Honeypot"
-  vpc_id      = "${var.vpc-id}"
+  vpc_id      = var.vpc-id
 
   ingress {
     from_port   = 0
@@ -19,19 +19,19 @@ resource "aws_security_group" "tpot" {
     from_port   = 64294
     to_port     = 64294
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
   ingress {
     from_port   = 64295
     to_port     = 64295
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
   ingress {
     from_port   = 64297
     to_port     = 64297
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
   egress {
     from_port   = 0
@@ -50,20 +50,20 @@ resource "aws_security_group" "tpot" {
 resource "aws_security_group" "fbctf" {
   name        = "FB-CTF"
   description = "FaceBook Capture The Flag"
-  vpc_id      = "${var.vpc-id}"
+  vpc_id      = var.vpc-id
 
   ingress {
     from_port   = 443
     to_port     = 443
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   ingress {
     from_port   = 0
     to_port     = 0
     protocol    = "-1"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # Allow all traffic from the private subnet
@@ -91,7 +91,7 @@ resource "aws_security_group" "fbctf" {
 resource "aws_security_group" "kali" {
   name        = "attackers"
   description = "penetration testing assets"
-  vpc_id      = "${var.vpc-id}"
+  vpc_id      = var.vpc-id
 
 
   # terminal/ssh rule
@@ -99,7 +99,7 @@ resource "aws_security_group" "kali" {
     from_port   = 22
     to_port     = 22
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # vnc rule
@@ -107,7 +107,7 @@ resource "aws_security_group" "kali" {
     from_port   = 5901
     to_port     = 5901
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # just open up everything else
@@ -115,7 +115,7 @@ resource "aws_security_group" "kali" {
     from_port   = 0
     to_port     = 0
     protocol    = "-1"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
   # Allow all traffic from the private subnet
   ingress {
@@ -142,14 +142,14 @@ resource "aws_security_group" "kali" {
 resource "aws_security_group" "targets" {
   name        = "targets"
   description = "windows / linux targets"
-  vpc_id      = "${var.vpc-id}"
+  vpc_id      = var.vpc-id
 
   # terminal/ssh rule
   ingress {
     from_port   = 22
     to_port     = 22
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # terminal/ssh rule
@@ -157,7 +157,7 @@ resource "aws_security_group" "targets" {
     from_port   = 8080
     to_port     = 8080
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # inbound rules
@@ -165,7 +165,7 @@ resource "aws_security_group" "targets" {
     from_port   = 0
     to_port     = 0
     protocol    = "-1"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # Allow all traffic from the private subnet
@@ -181,7 +181,7 @@ resource "aws_security_group" "targets" {
     from_port   = 0
     to_port     = 0
     protocol    = "-1"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
   tags = {
     Name        = "webgoat_sg"
@@ -194,14 +194,14 @@ resource "aws_security_group" "targets" {
 resource "aws_security_group" "logger" {
   name        = "logger_security_group"
   description = "DetectionLab: Security Group for the logger host"
-  vpc_id      = "${var.vpc-id}"
+  vpc_id      = var.vpc-id
 
   # SSH access
   ingress {
     from_port   = 22
     to_port     = 22
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # Splunk access
@@ -209,7 +209,7 @@ resource "aws_security_group" "logger" {
     from_port   = 8000
     to_port     = 8000
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # Fleet access
@@ -217,7 +217,7 @@ resource "aws_security_group" "logger" {
     from_port   = 8412
     to_port     = 8412
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # Caldera access
@@ -225,7 +225,7 @@ resource "aws_security_group" "logger" {
     from_port   = 8888
     to_port     = 8888
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # Allow all traffic from the private subnet
@@ -248,14 +248,14 @@ resource "aws_security_group" "logger" {
 resource "aws_security_group" "windows" {
   name        = "windows_security_group"
   description = "DetectionLab: Security group for the Windows hosts"
-  vpc_id      = "${var.vpc-id}"
+  vpc_id      = var.vpc-id
 
   # RDP
   ingress {
     from_port   = 3389
     to_port     = 3389
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # WinRM
@@ -263,7 +263,7 @@ resource "aws_security_group" "windows" {
     from_port   = 5985
     to_port     = 5986
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # Windows ATA
@@ -271,7 +271,7 @@ resource "aws_security_group" "windows" {
     from_port   = 443
     to_port     = 443
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # Allow all traffic from the private subnet
@@ -299,14 +299,14 @@ resource "aws_security_group" "windows" {
 resource "aws_security_group" "malware" {
   name        = "malware"
   description = "flarevm malware security group"
-  vpc_id      = "${var.vpc-id}"
+  vpc_id      = var.vpc-id
 
   # RDP
   ingress {
     from_port   = 3389
     to_port     = 3389
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # ssh access
@@ -314,7 +314,7 @@ resource "aws_security_group" "malware" {
     from_port   = 0
     to_port     = 22
     protocol    = "tcp"
-    cidr_blocks = ["${var.ip_list}"]
+    cidr_blocks = ["${var.ip_list}"[0], "${var.ip_list}"[1]]
   }
 
   # outbound internet access - eliminate everything
diff --git a/terraform/modules/infrastructure/assets/secdevops/security_groups_rules.tf b/terraform/modules/infrastructure/assets/secdevops/security_groups_rules.tf
index a1bf88c..b40d6fb 100644
--- a/terraform/modules/infrastructure/assets/secdevops/security_groups_rules.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/security_groups_rules.tf
@@ -6,7 +6,7 @@ resource "aws_security_group_rule" "allow_all_between_webgoat_and_kali" {
   to_port           = 0
   protocol          = "-1"
   cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = "${aws_security_group.targets.id}"
+  security_group_id = aws_security_group.targets.id
 }
 
 resource "aws_security_group_rule" "allow_all_between_kali_and_webgoat" {
@@ -15,7 +15,7 @@ resource "aws_security_group_rule" "allow_all_between_kali_and_webgoat" {
   to_port           = 0
   protocol          = "-1"
   cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = "${aws_security_group.kali.id}"
+  security_group_id = aws_security_group.kali.id
 }
 
 resource "aws_security_group_rule" "allow_malware_to_malware" {
@@ -24,5 +24,5 @@ resource "aws_security_group_rule" "allow_malware_to_malware" {
   to_port           = 0
   protocol          = "-1"
   cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = "${aws_security_group.malware.id}"
+  security_group_id = aws_security_group.malware.id
 }
\ No newline at end of file
diff --git a/terraform/modules/infrastructure/assets/secdevops/target.metasplotables.tf b/terraform/modules/infrastructure/assets/secdevops/target.metasplotables.tf
index cf45bb1..1bafdaf 100644
--- a/terraform/modules/infrastructure/assets/secdevops/target.metasplotables.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/target.metasplotables.tf
@@ -1,14 +1,14 @@
 
 resource "aws_instance" "cr_ms3_2k8" {
-  count = "${var.docker_ct}"
+  count = var.docker_ct
 
-  ami           = "${data.aws_ami.ms3_2k8.id}"
-  instance_type = "${var.instance_type_win}"
+  ami           = data.aws_ami.ms3_2k8.id
+  instance_type = var.instance_type_win
 
-  subnet_id              = "${element(local.cyberRange_windows_subnets_ids, count.index)}"
+  subnet_id              = element(local.cyberRange_windows_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
 
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
 
   root_block_device {
     delete_on_termination = true
@@ -22,13 +22,13 @@ resource "aws_instance" "cr_ms3_2k8" {
 }
 
 resource "aws_instance" "ami_ms3_2k12" {
-  count = "${var.docker_ct}"
-  ami = "${data.aws_ami.ms3_2k12.id}"
-  instance_type = "${var.instance_type_win}"
-  subnet_id = "${element(local.cyberRange_windows_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami = data.aws_ami.ms3_2k12.id
+  instance_type = var.instance_type_win
+  subnet_id = element(local.cyberRange_windows_subnets_ids, count.index)
   vpc_security_group_ids = [
     "${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -41,12 +41,12 @@ resource "aws_instance" "ami_ms3_2k12" {
 }
 
 resource "aws_instance" "cr_ms3_nix" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.ms3_nix.id}"
-  instance_type = "${var.instance_type_docker}"
-  subnet_id              = "${element(local.cyberRange_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.ms3_nix.id
+  instance_type = var.instance_type_docker
+  subnet_id              = element(local.cyberRange_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
diff --git a/terraform/modules/infrastructure/assets/secdevops/target.window.volumes.tf b/terraform/modules/infrastructure/assets/secdevops/target.window.volumes.tf
deleted file mode 100644
index 7921bf5..0000000
--- a/terraform/modules/infrastructure/assets/secdevops/target.window.volumes.tf
+++ /dev/null
@@ -1,122 +0,0 @@
-
-data "aws_ebs_volume" "win2008_ebs_volume" {
-  most_recent = true
-
-  filter {
-    name   = "attachment.instance-id"
-    values = ["${aws_instance.win2008[0].id}"]
-  }
-}
-
-output "win2008_ebs_vol_id" {
-  value = "${data.aws_ebs_volume.win2008_ebs_volume.id}"
-}
-
-data "aws_ebs_volume" "cr_ms3_2k8" {
-  most_recent = true
-
-  filter {
-    name   = "attachment.instance-id"
-    values = ["${aws_instance.cr_ms3_2k8[0].id}"]
-  }
-}
-
-output "cr_ms3_2k8_vol_id" {
-  value = "${data.aws_ebs_volume.cr_ms3_2k8.id}"
-}
-
-data "aws_ebs_volume" "win7" {
-  most_recent = true
-
-  filter {
-    name   = "attachment.instance-id"
-    values = ["${aws_instance.win7[0].id}"]
-  }
-}
-
-output "win7_vol_id" {
-  value = "${data.aws_ebs_volume.win7.id}"
-}
-
-data "aws_ebs_volume" "win8" {
-  most_recent = true
-
-  filter {
-    name   = "attachment.instance-id"
-    values = ["${aws_instance.win8[0].id}"]
-  }
-}
-
-output "win8_vol_id" {
-  value = "${data.aws_ebs_volume.win8.id}"
-}
-
-
-data "aws_ebs_volume" "win2k10" {
-  most_recent = true
-
-  filter {
-    name   = "attachment.instance-id"
-    values = ["${aws_instance.defender_win2k10[0].id}"]
-  }
-}
-
-output "win2k10_vol_id" {
-  value = "${data.aws_ebs_volume.win2k10.id}"
-}
-
-
-data "aws_ebs_volume" "win2012" {
-  most_recent = true
-
-  filter {
-    name   = "attachment.instance-id"
-    values = ["${aws_instance.win2012[0].id}"]
-  }
-}
-
-output "win2k12_vol_id" {
-  value = "${data.aws_ebs_volume.win2012.id}"
-}
-
-
-data "aws_ebs_volume" "win2012_RTM" {
-  most_recent = true
-
-  filter {
-    name   = "attachment.instance-id"
-    values = ["${aws_instance.win2012_RTM[0].id}"]
-  }
-}
-
-output "win2012_RTM_vol_id" {
-  value = "${data.aws_ebs_volume.win2012_RTM.id}"
-}
-
-
-data "aws_ebs_volume" "win2016" {
-  most_recent = true
-
-  filter {
-    name   = "attachment.instance-id"
-    values = ["${aws_instance.win2016[0].id}"]
-  }
-}
-
-output "win2k16_vol_id" {
-  value = "${data.aws_ebs_volume.win2016.id}"
-}
-
-
-data "aws_ebs_volume" "win2019" {
-  most_recent = true
-
-  filter {
-    name   = "attachment.instance-id"
-    values = ["${aws_instance.win2019[0].id}"]
-  }
-}
-
-output "win2k19_vol_id" {
-  value = "${data.aws_ebs_volume.win2019.id}"
-}
diff --git a/terraform/modules/infrastructure/assets/secdevops/target.windows.tf b/terraform/modules/infrastructure/assets/secdevops/target.windows.tf
index 72dfd0a..f35ca3f 100644
--- a/terraform/modules/infrastructure/assets/secdevops/target.windows.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/target.windows.tf
@@ -1,18 +1,17 @@
 locals {
   cyberRange_windows_subnets_ids = [
-    "${var.attacker_subnet_id}",
     "${var.target_subnet_id}",
   ]
 }
 
 
 resource "aws_instance" "win2008" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.win2k8.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_windows_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.win2k8.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_windows_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -24,13 +23,13 @@ resource "aws_instance" "win2008" {
 }
 
 resource "aws_instance" "win7" {
-  count         = "${var.docker_ct}"
-  ami           = "${data.aws_ami.win7.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id               = "${element(local.cyberRange_windows_subnets_ids, count.index)}"
+  count         = var.docker_ct
+  ami           = data.aws_ami.win7.id
+  instance_type = var.instance_type
+  subnet_id               = element(local.cyberRange_windows_subnets_ids, count.index)
   vpc_security_group_ids  = ["${aws_security_group.targets.id}"]
-  key_name                = "${aws_key_pair.circleci_key.key_name}"
-  user_data               = "${var.win_bootstrap_user_data}"
+  key_name                = aws_key_pair.circleci_key.key_name
+  user_data               = var.win_bootstrap_user_data
   root_block_device {
     delete_on_termination = true
   }
@@ -42,12 +41,12 @@ resource "aws_instance" "win7" {
 }
 
 resource "aws_instance" "win8" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.win8.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_windows_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.win8.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_windows_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -59,12 +58,12 @@ resource "aws_instance" "win8" {
 }
 
 resource "aws_instance" "defender_win2k10" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.win2k10.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_windows_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.win2k10.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_windows_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -76,12 +75,12 @@ resource "aws_instance" "defender_win2k10" {
 }
 
 resource "aws_instance" "win2012" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.win2k12.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_windows_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.win2k12.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_windows_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -93,12 +92,12 @@ resource "aws_instance" "win2012" {
 }
 
 resource "aws_instance" "win2012_RTM" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.win2k12_RTM.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_windows_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.win2k12_RTM.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_windows_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -110,13 +109,13 @@ resource "aws_instance" "win2012_RTM" {
 }
 
 resource "aws_instance" "win2016" {
-  count = "${var.docker_ct}"
-  ami = "${data.aws_ami.win2k16.id}"
-  instance_type = "${var.instance_type_win}"
-  subnet_id              = "${element(local.cyberRange_windows_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami = data.aws_ami.win2k16.id
+  instance_type = var.instance_type_win
+  subnet_id              = element(local.cyberRange_windows_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
-  user_data = "${var.win_bootstrap_user_data}"
+  key_name = aws_key_pair.circleci_key.key_name
+  user_data = var.win_bootstrap_user_data
   root_block_device {
     delete_on_termination = true
   }
@@ -128,12 +127,12 @@ resource "aws_instance" "win2016" {
 }
 
 resource "aws_instance" "win2019" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.win2k19.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_windows_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.win2k19.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_windows_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
diff --git a/terraform/modules/infrastructure/assets/secdevops/targets.nix.tf b/terraform/modules/infrastructure/assets/secdevops/targets.nix.tf
index e844df1..94f1b0f 100644
--- a/terraform/modules/infrastructure/assets/secdevops/targets.nix.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/targets.nix.tf
@@ -2,18 +2,17 @@
 # original reference: https://github.com/BlacksInTechnologyOrg/bit-pentest-labs/blob/master/aws/terraform/modules/webgoat/webgoat.tf
 locals {
   cyberRange_subnets_ids = [
-    "${var.attacker_subnet_id}",
     "${var.target_subnet_id}",
   ]
 }
 
 resource "aws_instance" "cr_skytower" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.skytower.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.skytower.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -25,12 +24,12 @@ resource "aws_instance" "cr_skytower" {
 }
 
 resource "aws_instance" "cr_stapler" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.stapler.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.stapler.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -42,12 +41,12 @@ resource "aws_instance" "cr_stapler" {
 }
 
 resource "aws_instance" "cr_vulnos" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.vulnos.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.vulnos.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -59,12 +58,12 @@ resource "aws_instance" "cr_vulnos" {
 }
 
 resource "aws_instance" "cr_sickos" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.sickos.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.sickos.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -76,12 +75,12 @@ resource "aws_instance" "cr_sickos" {
 }
 
 resource "aws_instance" "cr_mrrobot" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.mrrobot.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.mrrobot.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -93,12 +92,12 @@ resource "aws_instance" "cr_mrrobot" {
 }
 
 resource "aws_instance" "cr_fristileaks" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.fristileaks.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.fristileaks.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -110,12 +109,12 @@ resource "aws_instance" "cr_fristileaks" {
 }
 
 resource "aws_instance" "cr_hackinos" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.hackinos.id}"
-  instance_type = "${var.instance_type}"
-  subnet_id              = "${element(local.cyberRange_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.hackinos.id
+  instance_type = var.instance_type
+  subnet_id              = element(local.cyberRange_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -127,12 +126,12 @@ resource "aws_instance" "cr_hackinos" {
 }
 
 resource "aws_instance" "cr_bulldog" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.bulldog.id}"
-  instance_type = "${var.instance_type_docker}"
-  subnet_id              = "${element(local.cyberRange_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.bulldog.id
+  instance_type = var.instance_type_docker
+  subnet_id              = element(local.cyberRange_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -144,12 +143,12 @@ resource "aws_instance" "cr_bulldog" {
 }
 
 resource "aws_instance" "cr_myhouse7" {
-  count = "${var.docker_ct}"
-  ami           = "${data.aws_ami.myhouse7.id}"
-  instance_type = "${var.instance_type_docker}"
-  subnet_id              = "${element(local.cyberRange_subnets_ids, count.index)}"
+  count = var.docker_ct
+  ami           = data.aws_ami.myhouse7.id
+  instance_type = var.instance_type_docker
+  subnet_id              = element(local.cyberRange_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
   root_block_device {
     delete_on_termination = true
   }
@@ -161,14 +160,14 @@ resource "aws_instance" "cr_myhouse7" {
 }
 
 resource "aws_instance" "docker" {
-  count = "${var.docker_ct}"
+  count = var.docker_ct
 
-  ami           = "${data.aws_ami.ubuntu.id}"
-  instance_type = "${var.instance_type_docker}"
-  subnet_id              = "${element(local.cyberRange_subnets_ids, count.index)}"
+  ami           = data.aws_ami.ubuntu.id
+  instance_type = var.instance_type_docker
+  subnet_id              = element(local.cyberRange_subnets_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.targets.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
-  user_data = "${file("../../modules/infrastructure/cloud-init/docker.targets.yml")}"
+  key_name = aws_key_pair.circleci_key.key_name
+  user_data = file("../../modules/infrastructure/cloud-init/docker.targets.yml")
   root_block_device {
     delete_on_termination = true
   }
diff --git a/terraform/modules/infrastructure/assets/secdevops/tenable.tf b/terraform/modules/infrastructure/assets/secdevops/tenable.tf
index 6054825..c3ef934 100644
--- a/terraform/modules/infrastructure/assets/secdevops/tenable.tf
+++ b/terraform/modules/infrastructure/assets/secdevops/tenable.tf
@@ -6,13 +6,13 @@ locals {
 }
 
 resource "aws_instance" "nessus" {
-  count = "${var.kali_ct}"
+  count = var.kali_ct
 
-  ami = "${data.aws_ami.nessus.id}"
-  instance_type = "${var.instance_type_kali}"
-  subnet_id              = "${element(local.tenable_subnet_ids, count.index)}"
+  ami = data.aws_ami.nessus.id
+  instance_type = var.instance_type_kali
+  subnet_id              =element(local.tenable_subnet_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.kali.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
 
   root_block_device {
     delete_on_termination = true
@@ -27,13 +27,13 @@ resource "aws_instance" "nessus" {
 }
 
 resource "aws_instance" "sc" {
-  count = "${var.kali_ct}"
+  count = var.kali_ct
 
-  ami = "${data.aws_ami.sc.id}"
-  instance_type = "${var.instance_type_kali}"
-  subnet_id              = "${element(local.tenable_subnet_ids, count.index)}"
+  ami = data.aws_ami.sc.id
+  instance_type = var.instance_type_kali
+  subnet_id              = element(local.tenable_subnet_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.kali.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
 
   root_block_device {
     delete_on_termination = true
@@ -49,13 +49,13 @@ resource "aws_instance" "sc" {
 
 
 resource "aws_instance" "nnm" {
-  count = "${var.kali_ct}"
+  count = var.kali_ct
 
-  ami = "${data.aws_ami.nnm.id}"
-  instance_type = "${var.instance_type_kali}"
-  subnet_id              = "${element(local.tenable_subnet_ids, count.index)}"
+  ami = data.aws_ami.nnm.id 
+  instance_type = var.instance_type_kali
+  subnet_id              = element(local.tenable_subnet_ids, count.index)
   vpc_security_group_ids = ["${aws_security_group.kali.id}"]
-  key_name = "${aws_key_pair.circleci_key.key_name}"
+  key_name = aws_key_pair.circleci_key.key_name
 
   root_block_device {
     delete_on_termination = true