diff --git a/.gitignore b/.gitignore
index e063d5d..3b1acce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,8 @@
 .vagrant
 real-adminrc
 *.taskpaper
-terraform/tf-example/terraform.tfstate*
+*.tfstate
+*.tfstate.backup
+*.tfvars
 consul-*.config.json
+*.defaults
diff --git a/docker/swarm-etcd/.gitignore b/docker/swarm-etcd/.gitignore
deleted file mode 100644
index 277ea56..0000000
--- a/docker/swarm-etcd/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.vagrant
-*.defaults
diff --git a/docker/swarm-etcd2-photon/.gitignore b/docker/swarm-etcd2-photon/.gitignore
deleted file mode 100644
index 277ea56..0000000
--- a/docker/swarm-etcd2-photon/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.vagrant
-*.defaults
diff --git a/etcd/etcd-2.0/.gitignore b/etcd/etcd-2.0/.gitignore
deleted file mode 100644
index 277ea56..0000000
--- a/etcd/etcd-2.0/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.vagrant
-*.defaults
diff --git a/terraform/aws/.gitignore b/terraform/aws/.gitignore
deleted file mode 100644
index e2bf8bc..0000000
--- a/terraform/aws/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.tfstate
-*.tfstate.backup