diff --git a/deployment/live/gcp/static-ct-staging/cloudbuild/staging/.terraform.lock.hcl b/deployment/live/gcp/static-ct-staging/cloudbuild/arche2025h1/.terraform.lock.hcl
similarity index 100%
rename from deployment/live/gcp/static-ct-staging/cloudbuild/staging/.terraform.lock.hcl
rename to deployment/live/gcp/static-ct-staging/cloudbuild/arche2025h1/.terraform.lock.hcl
diff --git a/deployment/live/gcp/static-ct-staging/cloudbuild/README.md b/deployment/live/gcp/static-ct-staging/cloudbuild/arche2025h1/README.md
similarity index 100%
rename from deployment/live/gcp/static-ct-staging/cloudbuild/README.md
rename to deployment/live/gcp/static-ct-staging/cloudbuild/arche2025h1/README.md
diff --git a/deployment/live/gcp/static-ct-staging/cloudbuild/terragrunt.hcl b/deployment/live/gcp/static-ct-staging/cloudbuild/arche2025h1/terragrunt.hcl
similarity index 55%
rename from deployment/live/gcp/static-ct-staging/cloudbuild/terragrunt.hcl
rename to deployment/live/gcp/static-ct-staging/cloudbuild/arche2025h1/terragrunt.hcl
index 36d8a775..9a4e4025 100644
--- a/deployment/live/gcp/static-ct-staging/cloudbuild/terragrunt.hcl
+++ b/deployment/live/gcp/static-ct-staging/cloudbuild/arche2025h1/terragrunt.hcl
@@ -1,14 +1,17 @@
 terraform {
-  source = "${get_repo_root()}/deployment/modules/gcp//cloudbuild/preloaded"
+  source = "${get_repo_root()}/deployment/modules/gcp//cloudbuild/tesseract"
 }
 
 locals {
-  env          = path_relative_to_include()
-  project_id   = get_env("GOOGLE_PROJECT", "static-ct-staging")
-  location     = get_env("GOOGLE_REGION", "us-central1")
-  github_owner = get_env("GITHUB_OWNER", "transparency-dev")
+  env            = get_env("GOOGLE_ENV", "staging")
+  docker_env     = get_env("GOOGLE_ENV", "staging")
+  project_id     = get_env("GOOGLE_PROJECT", "static-ct-staging")
+  location       = get_env("GOOGLE_REGION", "us-central1")
+  github_owner   = get_env("GITHUB_OWNER", "transparency-dev")
 }
 
+inputs = local
+
 remote_state {
   backend = "gcs"
 
@@ -24,3 +27,4 @@ remote_state {
     }
   }
 }
+
diff --git a/deployment/live/gcp/static-ct-staging/cloudbuild/staging/terragrunt.hcl b/deployment/live/gcp/static-ct-staging/cloudbuild/staging/terragrunt.hcl
deleted file mode 100644
index bfe38813..00000000
--- a/deployment/live/gcp/static-ct-staging/cloudbuild/staging/terragrunt.hcl
+++ /dev/null
@@ -1,13 +0,0 @@
-locals {
-  docker_env = include.root.locals.env
-}
-
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-inputs = merge(
-  local,
-  include.root.locals,
-)
diff --git a/deployment/live/gcp/static-ct-staging/logs/arche2025h1/README.md b/deployment/live/gcp/static-ct-staging/logs/arche2025h1/README.md
index afc36421..d9ce0c23 100644
--- a/deployment/live/gcp/static-ct-staging/logs/arche2025h1/README.md
+++ b/deployment/live/gcp/static-ct-staging/logs/arche2025h1/README.md
@@ -25,7 +25,7 @@ awk \
 
 
 ### Automatic Deployment
-This GCP SCTFE preloaded staging environment is designed to be deployed by the Cloud Build ([Terraform module](/deployment/modules/gcp/cloudbuild/preloaded/), [Terragrunt configuration](/deployment/live/gcp/static-ct-staging/cloudbuild/staging/)).
+This GCP SCTFE preloaded staging environment is designed to be deployed by the Cloud Build ([Terraform module](/deployment/modules/gcp/cloudbuild/tesseract/), [Terragrunt configuration](/deployment/live/gcp/static-ct-staging/cloudbuild/arche2025h1/)).
 
 ### Manual Deployment
 TODO(phboneff): come back to this, Cloud Run doesn't trigger a deployment if the tag does not change value.
diff --git a/deployment/modules/gcp/cloudbuild/preloaded/main.tf b/deployment/modules/gcp/cloudbuild/tesseract/main.tf
similarity index 100%
rename from deployment/modules/gcp/cloudbuild/preloaded/main.tf
rename to deployment/modules/gcp/cloudbuild/tesseract/main.tf
diff --git a/deployment/modules/gcp/cloudbuild/preloaded/variables.tf b/deployment/modules/gcp/cloudbuild/tesseract/variables.tf
similarity index 100%
rename from deployment/modules/gcp/cloudbuild/preloaded/variables.tf
rename to deployment/modules/gcp/cloudbuild/tesseract/variables.tf