diff --git a/tpl/aws/environment/s3.tf.tt b/tpl/aws/environment/s3.tf.tt
index 989c265..73e9ced 100644
--- a/tpl/aws/environment/s3.tf.tt
+++ b/tpl/aws/environment/s3.tf.tt
@@ -1,13 +1,18 @@
-# Create a bucket for kite purposes
-resource "aws_s3_bucket" "kite_bucket" {
-  bucket_prefix  = "<%= @cloud['aws']['bucket_name'] %>"
-
-  tags {
-    Name         = "<%= @cloud['aws']['bucket_name'] %>"
-    Component    = "kite-stack"
+# Store terraform state in s3 bucket
+ 
+terraform {
+  backend "s3" {
+    bucket = "<%= @cloud['aws']['bucket_name'] %>"
+    key    = "<%= @env_name %>-terraform.tfstate"
+    region = "<%= @cloud['region'] %>"
   }
 }
 
-output "bucket_name" {
-  value = "${aws_s3_bucket.kite_bucket.id}"
+data "terraform_remote_state" "network" {
+  backend = "s3"
+  config = {
+    bucket = "<%= @cloud['aws']['bucket_name'] %>"
+    key    = "network/terraform.tfstate"
+    region = "<%= @cloud['region'] %>"
+  }
 }