diff --git a/web/deploy/terraform/production/bootstrap/state_storage/main.tf b/web/deploy/terraform/production/bootstrap/state_storage/main.tf
deleted file mode 100644
index e4c48785..00000000
--- a/web/deploy/terraform/production/bootstrap/state_storage/main.tf
+++ /dev/null
@@ -1,10 +0,0 @@
-terraform {
-  required_version = ">= 1.0.0, < 2.0.0"
-}
-
-module "prod_state_bootstrap" {
-  # I would like to make this path more robust using something like `path.root`
-  source = "../../../modules/bootstrap/state_storage/"
-
-  environment = var.environment
-}
diff --git a/web/deploy/terraform/production/bootstrap/state_storage/variables.tf b/web/deploy/terraform/production/bootstrap/state_storage/variables.tf
deleted file mode 100644
index 67aaa8e0..00000000
--- a/web/deploy/terraform/production/bootstrap/state_storage/variables.tf
+++ /dev/null
@@ -1,5 +0,0 @@
-variable "environment" {
-  description = "The name of the development environment. Usually `stage` or `prod`. Defaults to `prod`"
-  type        = string
-  default     = "prod"
-}
diff --git a/web/deploy/terraform/staging/bootstrap/state_storage/main.tf b/web/deploy/terraform/staging/bootstrap/state_storage/main.tf
deleted file mode 100644
index d86f1e4e..00000000
--- a/web/deploy/terraform/staging/bootstrap/state_storage/main.tf
+++ /dev/null
@@ -1,10 +0,0 @@
-terraform {
-  required_version = ">= 1.0.0, < 2.0.0"
-}
-
-module "stage_state_bootstrap" {
-  # I would like to make this path more robust using something like `path.root`
-  source = "../../../modules/bootstrap/state_storage/"
-
-  environment = var.environment
-}
diff --git a/web/deploy/terraform/staging/bootstrap/state_storage/variables.tf b/web/deploy/terraform/staging/bootstrap/state_storage/variables.tf
deleted file mode 100644
index d7e81385..00000000
--- a/web/deploy/terraform/staging/bootstrap/state_storage/variables.tf
+++ /dev/null
@@ -1,5 +0,0 @@
-variable "environment" {
-  description = "The name of the development environment. Usually `stage` or `prod`. Defaults to `stage`"
-  type        = string
-  default     = "stage"
-}
diff --git a/web/deploy/terraform/modules/bootstrap/state_storage/main.tf b/web/deploy/terraform/state/bootstrap/main.tf
similarity index 100%
rename from web/deploy/terraform/modules/bootstrap/state_storage/main.tf
rename to web/deploy/terraform/state/bootstrap/main.tf
diff --git a/web/deploy/terraform/modules/bootstrap/state_storage/outputs.tf b/web/deploy/terraform/state/bootstrap/outputs.tf
similarity index 100%
rename from web/deploy/terraform/modules/bootstrap/state_storage/outputs.tf
rename to web/deploy/terraform/state/bootstrap/outputs.tf
diff --git a/web/deploy/terraform/modules/bootstrap/state_storage/variables.tf b/web/deploy/terraform/state/bootstrap/variables.tf
similarity index 100%
rename from web/deploy/terraform/modules/bootstrap/state_storage/variables.tf
rename to web/deploy/terraform/state/bootstrap/variables.tf
diff --git a/web/deploy/terraform/state/main.tf b/web/deploy/terraform/state/main.tf
new file mode 100644
index 00000000..2aefb443
--- /dev/null
+++ b/web/deploy/terraform/state/main.tf
@@ -0,0 +1,13 @@
+terraform {
+  required_version = ">= 1.0.0, < 2.0.0"
+}
+
+module "stage_state" {
+  source      = "./bootstrap/"
+  environment = "stage"
+}
+
+module "prod_state" {
+  source      = "./bootstrap/"
+  environment = "prod"
+}