diff --git a/deployment/live/gcp/example-gcp/terragrunt.hcl b/deployment/live/gcp/example-gcp/terragrunt.hcl
index c1ed8e920..737cbae27 100644
--- a/deployment/live/gcp/example-gcp/terragrunt.hcl
+++ b/deployment/live/gcp/example-gcp/terragrunt.hcl
@@ -6,7 +6,7 @@ locals {
   env         = path_relative_to_include()
   project_id = get_env("GOOGLE_PROJECT", "trillian-tessera")
   location   = get_env("GOOGLE_REGION", "us-central1")
-  base_name   = get_env("TESSERA_BASE_NAME", "${path_relative_to_include()}-example-gcp")
+  base_name   = get_env("TESSERA_BASE_NAME", "${local.env}-example-gcp")
 }
 
 remote_state {
@@ -16,7 +16,7 @@ remote_state {
     project  = local.project_id
     location = local.location
     bucket   = "${local.project_id}-${local.base_name}-terraform-state"
-    prefix   = "${path_relative_to_include()}/terraform.tfstate"
+    prefix   = "${local.env}/terraform.tfstate"
 
     gcs_bucket_labels = {
       name  = "terraform_state_storage"