diff --git a/terraform/aws/consul.tf b/terraform/aws/consul.tf
index 1176f833af..0db1e1dba5 100644
--- a/terraform/aws/consul.tf
+++ b/terraform/aws/consul.tf
@@ -1,7 +1,6 @@
 resource "aws_instance" "server" {
     ami = "${lookup(var.ami, concat(var.region, "-", var.platform))}"
-    #ami = "${lookup(var.ami, var.region, var.platform)}"
-    instance_type = "${var.instance_type}"
+    instance_type = "${lookup(var.instance_type, var.platform)}"
     key_name = "${var.key_name}"
     count = "${var.servers}"
     security_groups = ["${aws_security_group.consul.name}"]
diff --git a/terraform/aws/scripts/rhel/install.sh b/terraform/aws/scripts/rhel6/install.sh
similarity index 100%
rename from terraform/aws/scripts/rhel/install.sh
rename to terraform/aws/scripts/rhel6/install.sh
diff --git a/terraform/aws/scripts/rhel/server.sh b/terraform/aws/scripts/rhel6/server.sh
similarity index 100%
rename from terraform/aws/scripts/rhel/server.sh
rename to terraform/aws/scripts/rhel6/server.sh
diff --git a/terraform/aws/scripts/rhel/service.sh b/terraform/aws/scripts/rhel6/service.sh
similarity index 100%
rename from terraform/aws/scripts/rhel/service.sh
rename to terraform/aws/scripts/rhel6/service.sh
diff --git a/terraform/aws/scripts/rhel/upstart-join.conf b/terraform/aws/scripts/rhel6/upstart-join.conf
similarity index 100%
rename from terraform/aws/scripts/rhel/upstart-join.conf
rename to terraform/aws/scripts/rhel6/upstart-join.conf
diff --git a/terraform/aws/scripts/rhel/upstart.conf b/terraform/aws/scripts/rhel6/upstart.conf
similarity index 100%
rename from terraform/aws/scripts/rhel/upstart.conf
rename to terraform/aws/scripts/rhel6/upstart.conf
diff --git a/terraform/aws/variables.tf b/terraform/aws/variables.tf
index 7807c2a9e4..c06cbec965 100644
--- a/terraform/aws/variables.tf
+++ b/terraform/aws/variables.tf
@@ -3,11 +3,6 @@ variable "platform" {
     description = "The region of AWS, for AMI lookups."
 }
 
-variable "user" {
-    default = "ubuntu"
-    description = "The region of AWS, for AMI lookups."
-}
-
 variable "user" {
     default = {
         ubuntu = "ubuntu"
@@ -43,8 +38,10 @@ variable "servers" {
 }
 
 variable "instance_type" {
-    default = "m3.medium"
-    description = "The instance type to launch."
+    default = {
+        ubuntu = "m1.small"
+        rhel6 = "m3.medium"
+    }
 }
 
 variable "tagName" {