diff --git a/core/src/epicli/Pipfile b/core/src/epicli/Pipfile
index 2ea1c9c864..71b04fb11d 100644
--- a/core/src/epicli/Pipfile
+++ b/core/src/epicli/Pipfile
@@ -16,7 +16,7 @@ boto3 = "*"
 jsonschema = "*"
 python-json-logger = "*"
 ansible = "*"
-terraform-binary = "*"
+terraform-bin = "*"
 
 [requires]
 python_version = "3.7"
diff --git a/core/src/epicli/Pipfile.lock b/core/src/epicli/Pipfile.lock
index 04fbf71bfd..8e4dcaa976 100644
--- a/core/src/epicli/Pipfile.lock
+++ b/core/src/epicli/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "5eac281bc387f8394939091459143b61e2631850bcdd14eeed680d2a06385765"
+            "sha256": "b528cc683e3bdc332aae79a02b9a941f936cb790e13580d677495f989d693128"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -18,10 +18,10 @@
     "default": {
         "ansible": {
             "hashes": [
-                "sha256:e1d51d3a88e21238f9e7a49b2b17a49e76c13880242b936ac8a37aee4fe84445"
+                "sha256:05f9ed3ca3e06dffaa87a73a8e6f7f322825bc3f609f8b71c4fe22dbbdf72abc"
             ],
             "index": "pypi",
-            "version": "==2.8.1"
+            "version": "==2.8.3"
         },
         "asn1crypto": {
             "hashes": [
@@ -39,18 +39,18 @@
         },
         "boto3": {
             "hashes": [
-                "sha256:050e855eb034df38e737c9598ef74610b7a2912bddb8db00a30596e3c75bd482",
-                "sha256:af3992dc2e99b6d062dfc97afce93695058430b3ba7d59ce42b78e6ae09b8003"
+                "sha256:0cd4a3e158f40eedb54b36b3fbe60d135db74a245f0ca8eead1af2eb6d46a649",
+                "sha256:68e9eba6f846cf8e01973ec565afdb1adfb9612b531c15bb5c5524394db4df5b"
             ],
             "index": "pypi",
-            "version": "==1.9.182"
+            "version": "==1.9.199"
         },
         "botocore": {
             "hashes": [
-                "sha256:1482cfa725bb1b678e02b006f15cb966ff5c3a20c2d9b0aff946056bd6baf152",
-                "sha256:d1e556a130baca5719192031732c96c2455322369719ac4304ff5044b347d847"
+                "sha256:25d87047241b7b775443570c0e790ca952f9f7491d4d6472430a4b006383a257",
+                "sha256:e4729c1acaa936d4c5c948a18d279f92bbf61fad9b5fb03942c753ec405e427d"
             ],
-            "version": "==1.12.182"
+            "version": "==1.12.199"
         },
         "cffi": {
             "hashes": [
@@ -131,11 +131,11 @@
         },
         "jsonschema": {
             "hashes": [
-                "sha256:0c0a81564f181de3212efa2d17de1910f8732fa1b71c42266d983cd74304e20d",
-                "sha256:a5f6559964a3851f59040d3b961de5e68e70971afb88ba519d27e6a039efff1a"
+                "sha256:5f9c0a719ca2ce14c5de2fd350a64fd2d13e8539db29836a86adc990bb1a068f",
+                "sha256:8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d"
             ],
             "index": "pypi",
-            "version": "==3.0.1"
+            "version": "==3.0.2"
         },
         "markupsafe": {
             "hashes": [
@@ -172,16 +172,15 @@
         },
         "pycparser": {
             "hashes": [
-                "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3",
-                "sha256:d47687b1c43981ae0999ae87c3658ef22339086ffd36353611e783746f7d5601"
+                "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3"
             ],
             "version": "==2.19"
         },
         "pyrsistent": {
             "hashes": [
-                "sha256:16692ee739d42cf5e39cef8d27649a8c1fdb7aa99887098f1460057c5eb75c3a"
+                "sha256:34b47fa169d6006b32e99d4b3c4031f155e6e68ebcc107d6454852e8e0ee6533"
             ],
-            "version": "==0.15.2"
+            "version": "==0.15.4"
         },
         "python-dateutil": {
             "hashes": [
@@ -200,20 +199,22 @@
         },
         "pyyaml": {
             "hashes": [
-                "sha256:57acc1d8533cbe51f6662a55434f0dbecfa2b9eaf115bede8f6fd00115a0c0d3",
-                "sha256:588c94b3d16b76cfed8e0be54932e5729cc185caffaa5a451e7ad2f7ed8b4043",
-                "sha256:68c8dd247f29f9a0d09375c9c6b8fdc64b60810ebf07ba4cdd64ceee3a58c7b7",
-                "sha256:70d9818f1c9cd5c48bb87804f2efc8692f1023dac7f1a1a5c61d454043c1d265",
-                "sha256:86a93cccd50f8c125286e637328ff4eef108400dd7089b46a7be3445eecfa391",
-                "sha256:a0f329125a926876f647c9fa0ef32801587a12328b4a3c741270464e3e4fa778",
-                "sha256:a3c252ab0fa1bb0d5a3f6449a4826732f3eb6c0270925548cac342bc9b22c225",
-                "sha256:b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955",
-                "sha256:cd0618c5ba5bda5f4039b9398bb7fb6a317bb8298218c3de25c47c4740e4b95e",
-                "sha256:ceacb9e5f8474dcf45b940578591c7f3d960e82f926c707788a570b51ba59190",
-                "sha256:fe6a88094b64132c4bb3b631412e90032e8cfe9745a58370462240b8cb7553cd"
+                "sha256:0113bc0ec2ad727182326b61326afa3d1d8280ae1122493553fd6f4397f33df9",
+                "sha256:01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4",
+                "sha256:5124373960b0b3f4aa7df1707e63e9f109b5263eca5976c66e08b1c552d4eaf8",
+                "sha256:5ca4f10adbddae56d824b2c09668e91219bb178a1eee1faa56af6f99f11bf696",
+                "sha256:7907be34ffa3c5a32b60b95f4d95ea25361c951383a894fec31be7252b2b6f34",
+                "sha256:7ec9b2a4ed5cad025c2278a1e6a19c011c80a3caaac804fd2d329e9cc2c287c9",
+                "sha256:87ae4c829bb25b9fe99cf71fbb2140c448f534e24c998cc60f39ae4f94396a73",
+                "sha256:9de9919becc9cc2ff03637872a440195ac4241c80536632fffeb6a1e25a74299",
+                "sha256:a5a85b10e450c66b49f98846937e8cfca1db3127a9d5d1e31ca45c3d0bef4c5b",
+                "sha256:b0997827b4f6a7c286c01c5f60384d218dca4ed7d9efa945c3e1aa623d5709ae",
+                "sha256:b631ef96d3222e62861443cc89d6563ba3eeb816eeb96b2629345ab795e53681",
+                "sha256:bf47c0607522fdbca6c9e817a6e81b08491de50f3766a7a0e6a5be7905961b41",
+                "sha256:f81025eddd0327c7d4cfe9b62cf33190e1e736cc6e97502b3ec425f574b3e7a8"
             ],
             "index": "pypi",
-            "version": "==5.1.1"
+            "version": "==5.1.2"
         },
         "s3transfer": {
             "hashes": [
@@ -229,12 +230,12 @@
             ],
             "version": "==1.12.0"
         },
-        "terraform-binary": {
+        "terraform-bin": {
             "hashes": [
-                "sha256:3f525447e5fa9dbe20988d18c54acd926abe30619059870ce94179326adbbda5"
+                "sha256:af59ff1e59f620b7db88fd11411572aeab406d0759caa6028eaa01b9b3a9fc01"
             ],
             "index": "pypi",
-            "version": "==0.11.11.post1"
+            "version": "==1.0.1"
         },
         "urllib3": {
             "hashes": [
@@ -298,24 +299,24 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:6dfd58dfe281e8d240937776065dd3624ad5469c835248219bd16cf2e12dbeb7",
-                "sha256:cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db"
+                "sha256:23d3d873e008a513952355379d93cbcab874c58f4f034ff657c7a87422fa64e8",
+                "sha256:80d2de76188eabfbfcf27e6a37342c2827801e59c4cc14b0371c56fed43820e3"
             ],
-            "version": "==0.18"
+            "version": "==0.19"
         },
         "more-itertools": {
             "hashes": [
-                "sha256:3ad685ff8512bf6dc5a8b82ebf73543999b657eded8c11803d9ba6b648986f4d",
-                "sha256:8bb43d1f51ecef60d81854af61a3a880555a14643691cc4b64a6ee269c78f09a"
+                "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832",
+                "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"
             ],
-            "version": "==7.1.0"
+            "version": "==7.2.0"
         },
         "packaging": {
             "hashes": [
-                "sha256:0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af",
-                "sha256:9e1cbf8c12b1f1ce0bb5344b8d7ecf66a6f8a6e91bcb0c84593ed6d3ab5c4ab3"
+                "sha256:a7ac867b97fdc07ee80a8058fe4435ccd274ecc3b0ed61d852d7d53055528cf9",
+                "sha256:c491ca87294da7cc01902edbe30a5bc6c4c28172b5138ab4e4aa1b9d7bfaeafe"
             ],
-            "version": "==19.0"
+            "version": "==19.1"
         },
         "pkginfo": {
             "hashes": [
@@ -347,18 +348,18 @@
         },
         "pyparsing": {
             "hashes": [
-                "sha256:1873c03321fc118f4e9746baf201ff990ceb915f433f23b395f5580d1840cb2a",
-                "sha256:9b6323ef4ab914af344ba97510e966d64ba91055d6b9afa6b30799340e89cc03"
+                "sha256:6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80",
+                "sha256:d9338df12903bbf5d65a0e4e87c2161968b10d2e489652bb47001d82a9b028b4"
             ],
-            "version": "==2.4.0"
+            "version": "==2.4.2"
         },
         "pytest": {
             "hashes": [
-                "sha256:2878de8ae1c79a62c012da6186b88ff0562ea96ce29c4208d2a9b11d9f607df1",
-                "sha256:95b700cf21ed5b7e91bce7a6b5a573b2e3ef7b3643d00f681d8f9c4672f9fbdf"
+                "sha256:6ef6d06de77ce2961156013e9dff62f1b2688aa04d0dc244299fe7d67e09370d",
+                "sha256:a736fed91c12681a7b34617c8fcefe39ea04599ca72c608751c31d89579a3f77"
             ],
             "index": "pypi",
-            "version": "==5.0.0"
+            "version": "==5.0.1"
         },
         "readme-renderer": {
             "hashes": [
@@ -435,10 +436,10 @@
         },
         "zipp": {
             "hashes": [
-                "sha256:8c1019c6aad13642199fbe458275ad6a84907634cc9f0989877ccc4a2840139d",
-                "sha256:ca943a7e809cc12257001ccfb99e3563da9af99d52f261725e96dfe0f9275bc3"
+                "sha256:4970c3758f4e89a7857a973b1e2a5d75bcdc47794442f2e2dd4fe8e0466e809a",
+                "sha256:8a5712cfd3bb4248015eb3b0b3c54a5f6ee3f2425963ef2a0125b8bc40aafaec"
             ],
-            "version": "==0.5.1"
+            "version": "==0.5.2"
         }
     }
 }
diff --git a/core/src/epicli/data/aws/defaults/infrastructure/efs-storage.yml b/core/src/epicli/data/aws/defaults/infrastructure/efs-storage.yml
index 7cfcc6ead0..73053e90ae 100644
--- a/core/src/epicli/data/aws/defaults/infrastructure/efs-storage.yml
+++ b/core/src/epicli/data/aws/defaults/infrastructure/efs-storage.yml
@@ -6,7 +6,7 @@ name: default
 specification:
   name: SET_BY_AUTOMATION
   token: SET_BY_AUTOMATION
-  encrypted: True
+  encrypted: true
   performance_mode: "generalPurpose"
   throughput_mode: "bursting"
   #provisioned_throughput_in_mibps:  # The throughput, measured in MiB/s, that you want to provision for the file system. Only applicable when throughput_mode set to provisioned
@@ -14,5 +14,5 @@ specification:
 #    - name: mount-name
 #      subnet_name: source_subnet_name
   security:
-    populate_sg_rules: True # when set to true, security group for EFS will allow traffic from other clusters, groups
+    populate_sg_rules: true # when set to true, security group for EFS will allow traffic from other clusters, groups
 
diff --git a/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml b/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml
index 742decea2c..917569f8e6 100644
--- a/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml
+++ b/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml
@@ -10,8 +10,8 @@ specification:
   availability_zones: [] # specified automatically - based on subnet az's
   launch_configuration: SET_BY_AUTOMATION
   cluster_name: SET_BY_AUTOMATION
-  authorized_to_efs: False
-  mount_efs: False
+  authorized_to_efs: false
+  mount_efs: false
   tags:
     - version: 0.3.0
   size: t2.micro
@@ -71,8 +71,8 @@ provider: aws
 name: kubernetes-master-machine
 specification:
   size: t3.medium
-  authorized_to_efs: True
-  mount_efs: True
+  authorized_to_efs: true
+  mount_efs: true
   security:
     rules:
      - name: ssh
@@ -151,8 +151,8 @@ provider: aws
 name: kubernetes-node-machine
 specification:
   size: t3.medium
-  authorized_to_efs: True
-  mount_efs: True
+  authorized_to_efs: true
+  mount_efs: true
   security:
     rules:
      - name: ssh
diff --git a/core/src/epicli/data/aws/terraform/infrastructure/efs-storage.j2 b/core/src/epicli/data/aws/terraform/infrastructure/efs-storage.j2
index 3f1bc20ccb..a98be6c7e8 100644
--- a/core/src/epicli/data/aws/terraform/infrastructure/efs-storage.j2
+++ b/core/src/epicli/data/aws/terraform/infrastructure/efs-storage.j2
@@ -12,7 +12,7 @@
 
 resource "aws_efs_file_system" "{{ specification.name }}" {
   creation_token = "{{ specification.token }}"
-  encrypted = "{{ specification.encrypted }}"
+  encrypted = "{{ specification.encrypted | lower }}"
   performance_mode = "{{ specification.performance_mode }}"
   throughput_mode = "{{ specification.throughput_mode }}"
 
diff --git a/core/src/epicli/data/aws/terraform/infrastructure/internet-gateway.j2 b/core/src/epicli/data/aws/terraform/infrastructure/internet-gateway.j2
index 8ce76dc6f9..52a0f4d099 100644
--- a/core/src/epicli/data/aws/terraform/infrastructure/internet-gateway.j2
+++ b/core/src/epicli/data/aws/terraform/infrastructure/internet-gateway.j2
@@ -13,7 +13,7 @@
 resource "aws_internet_gateway" "{{ specification.name }}" {
     vpc_id = "${aws_vpc.{{ specification.vpc_name }}.id}"
 
-    tags {
+    tags = {
         Name = "{{ specification.name }}"
         cluster_name = "{{ specification.cluster_name }}"
         cluster_version = "{{ version }}"
diff --git a/core/src/epicli/data/aws/terraform/infrastructure/launch-configuration.j2 b/core/src/epicli/data/aws/terraform/infrastructure/launch-configuration.j2
index f3539fb618..f4687ad76c 100644
--- a/core/src/epicli/data/aws/terraform/infrastructure/launch-configuration.j2
+++ b/core/src/epicli/data/aws/terraform/infrastructure/launch-configuration.j2
@@ -15,18 +15,18 @@ resource "aws_launch_configuration" "{{ specification.name }}" {
   name          = "{{ specification.name }}"
   image_id      = "{{ specification.image_id }}"
   instance_type = "{{ specification.size }}"
-  associate_public_ip_address = "{{ specification.associate_public_ip }}"
+  associate_public_ip_address = "{{ specification.associate_public_ip | lower  }}"
 
   # Security group
   security_groups = [{% for security_group in specification.security_groups %}  "${aws_security_group.{{ security_group }}.id}" {% if not loop.last %}, {% endif %} {% endfor %}]
-  enable_monitoring = "{{ specification.enable_monitoring }}"
+  enable_monitoring = "{{ specification.enable_monitoring | lower }}"
   key_name        = "{{ specification.key_name }}"
 
-  ebs_optimized   = "{{ specification.ebs_optimized }}"
+  ebs_optimized   = "{{ specification.ebs_optimized | lower }}"
   root_block_device {
     volume_type           = "{{ specification.disks.root.volume_type }}"
     volume_size           = "{{ specification.disks.root.volume_size }}"
-    delete_on_termination = "{{ specification.disks.root.delete_on_termination }}"
+    delete_on_termination = "{{ specification.disks.root.delete_on_termination | lower }}"
   }
 
 {% for disk in specification.disks.additional_disks %}
@@ -35,8 +35,8 @@ resource "aws_launch_configuration" "{{ specification.name }}" {
     device_name                 = "{{ disk.device_name }}"
     volume_type                 = "{{ disk.volume_type }}"
     volume_size                 = "{{ disk.volume_size }}"
-    encrypted                   = "{{ disk.encrypted }}"
-    delete_on_termination       = "{{ disk.delete_on_termination }}"
+    encrypted                   = "{{ disk.encrypted | lower }}"
+    delete_on_termination       = "{{ disk.delete_on_termination | lower }}"
   }
 
 {%- endfor %}
diff --git a/core/src/epicli/data/aws/terraform/infrastructure/route-table.j2 b/core/src/epicli/data/aws/terraform/infrastructure/route-table.j2
index 8c596fc01b..f7143b3e5e 100644
--- a/core/src/epicli/data/aws/terraform/infrastructure/route-table.j2
+++ b/core/src/epicli/data/aws/terraform/infrastructure/route-table.j2
@@ -18,7 +18,7 @@ resource "aws_route_table" "{{ specification.name }}" {
         gateway_id = "${ aws_internet_gateway.{{ specification.route.gateway_name }}.id}"
     }
 
-    tags {
+    tags = {
         Name = "web-table"
         cluster_name = "{{ specification.cluster_name }}"
         cluster_version = "{{ version }}"
diff --git a/core/src/epicli/data/aws/terraform/infrastructure/security-group.j2 b/core/src/epicli/data/aws/terraform/infrastructure/security-group.j2
index 92ab12efdd..4db45f6c9a 100644
--- a/core/src/epicli/data/aws/terraform/infrastructure/security-group.j2
+++ b/core/src/epicli/data/aws/terraform/infrastructure/security-group.j2
@@ -16,7 +16,7 @@ resource "aws_security_group" "{{ specification.name }}" {
   vpc_id      = "${aws_vpc.{{ specification.vpc_name }}.id}"
 
 
-  tags {
+  tags = {
       cluster_name = "{{ specification.cluster_name }}"
       cluster_version = "{{ version }}"
   }   
diff --git a/core/src/epicli/data/aws/terraform/infrastructure/vpc.j2 b/core/src/epicli/data/aws/terraform/infrastructure/vpc.j2
index 0bf6df0375..a103ffd1c1 100644
--- a/core/src/epicli/data/aws/terraform/infrastructure/vpc.j2
+++ b/core/src/epicli/data/aws/terraform/infrastructure/vpc.j2
@@ -16,7 +16,7 @@ resource "aws_vpc" "{{ specification.name }}" {
   enable_dns_support = "true"
   enable_dns_hostnames = "true"
 
-  tags {
+  tags = {
       Name = "{{ specification.name }}"
       cluster_name = "{{ specification.cluster_name }}"
       cluster_version = "{{ version }}"