diff --git a/lib/kite/core.rb b/lib/kite/core.rb
index 0b38d1c..e890d4f 100644
--- a/lib/kite/core.rb
+++ b/lib/kite/core.rb
@@ -27,9 +27,8 @@ def generate()
         copy_file("aws/terraform/bosh-aws-base.tf",               "terraform/bosh-aws-base.tf")
         copy_file("aws/terraform/outputs.tf",                     "terraform/outputs.tf")
         copy_file("aws/terraform/variables.tf",                   "terraform/variables.tf")
-        copy_file("aws/terraform/variables.tf",                   "terraform/variables.tf")
+        template("aws/terraform/terraform.tfvars.erb",            "terraform/terraform.tfvars")
 
-        template("aws/env.example.erb",                           ".env")
         copy_file("aws/README.md",                                "README.md")
         copy_file("aws/bootstrap.sh",                             "bootstrap.sh")
 
diff --git a/tpl/aws/bootstrap.sh b/tpl/aws/bootstrap.sh
index 45e92f9..3b4a1fb 100644
--- a/tpl/aws/bootstrap.sh
+++ b/tpl/aws/bootstrap.sh
@@ -1,24 +1,21 @@
 #!/usr/bin/env bash
 
-source ./.env
 
 pushd terraform && terraform apply && popd
 
-bash ./bin/make_manifest_bosh-init.sh
+kite render-manifest --manifest=bosh
 bosh-init deploy bosh-director.yml
 
-read -p "Enter bosh director ip: " bosh_director_ip
 pushd terraform && BOSH_DIRECTOR_IP=$(terraform output eip) && popd
 bosh target $BOSH_DIRECTOR_IP
 
-bash ./bin/make_cloud_config.sh
+kite render-manifest --manifest=concourse
 bosh update cloud-config aws-cloud.yml
 
 bosh upload stemcell https://bosh.io/d/stemcells/bosh-aws-xen-hvm-ubuntu-trusty-go_agent
 bosh upload release https://bosh.io/d/github.com/concourse/concourse
 bosh upload release https://bosh.io/d/github.com/cloudfoundry-incubator/garden-runc-release
 
-bash ./bin/make_manifest_concourse-cluster.sh
 bosh deployment concourse.yml
 
 bosh deploy
diff --git a/tpl/aws/env.example.erb b/tpl/aws/env.example.erb
deleted file mode 100644
index fa7c7c0..0000000
--- a/tpl/aws/env.example.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-export AWS_ACCESS_KEY_ID=<%= @values['aws']['access_key_id'] %>
-export AWS_SECRET_ACCESS_KEY=<%= @values['aws']['secret_access_key'] %>
-export AWS_REGION=<%= @values['aws']['region'] %>
-export AWS_AZ=<%= @values['aws']['az'] %>
-export BOSH_PASSWORD=<%= @values['aws']['bosh_password'] %>
-export AWS_KEYPAIR_KEY_NAME=<%= @values['aws']['keypair_name'] %>
-export PRIVATE_KEY_PATH=<%= @values['aws']['private_key_path'] %>
-
-export DB_PASSWORD=<%= @values['aws']['db_password'] %>
-export CONCOURSE_URL=<%= @values['aws']['concourse_url'] %>
-export CONCOURSE_AUTH_USERNAME=<%= @values['aws']['concourse_auth_username'] %>
-export CONCOURSE_AUTH_PASSWORD=<%= @values['aws']['concourse_auth_password'] %>