diff --git a/adapters/terraform/adapter.py b/adapters/terraform/adapter.py
index 93050f6..5fef97d 100644
--- a/adapters/terraform/adapter.py
+++ b/adapters/terraform/adapter.py
@@ -112,6 +112,8 @@ def adapt(stack_instance, out_dir):
 
     stack_name = stack.get("name", "spike")
     environment = stack.get("environment", "dev")
+    account_id = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
+    state_bucket = f"acdl-tfstate-{account_id}-us-east-1"
     terraform_tf = (
         'terraform {\n'
         '  required_version = ">= 1.9, < 1.10"\n'
@@ -122,7 +124,7 @@ def adapt(stack_instance, out_dir):
         '    }\n'
         '  }\n'
         '  backend "s3" {\n'
-        '    bucket = "acdl-tfstate-581513795199-us-east-1"\n'
+        f'    bucket = "{state_bucket}"\n'
         f'    key    = "spike/{stack_name}/{environment}/terraform.tfstate"\n'
         '    region = "us-east-1"\n'
         '  }\n'
@@ -137,7 +139,7 @@ def adapt(stack_instance, out_dir):
             'data "terraform_remote_state" "platform" {\n'
             '  backend = "s3"\n'
             '  config = {\n'
-            '    bucket = "acdl-tfstate-581513795199-us-east-1"\n'
+            f'    bucket = "{state_bucket}"\n'
             f'    key    = "{remote_state_key}"\n'
             '    region = "us-east-1"\n'
             '  }\n'
diff --git a/core/regression_verify.py b/core/regression_verify.py
index 81d1c18..47894ad 100755
--- a/core/regression_verify.py
+++ b/core/regression_verify.py
@@ -421,8 +421,10 @@ def _check_s3_state_bucket() -> Tuple[Status, str]:
         s3 = boto3.client("s3", region_name=env.get("AWS_DEFAULT_REGION", "us-east-1"),
                           aws_access_key_id=env.get("AWS_ACCESS_KEY_ID"),
                           aws_secret_access_key=env.get("AWS_SECRET_ACCESS_KEY"))
-        s3.head_bucket(Bucket="acdl-tfstate-581513795199-us-east-1")
-        r = s3.list_objects_v2(Bucket="acdl-tfstate-581513795199-us-east-1", MaxKeys=5)
+        account_id = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
+        state_bucket = f"acdl-tfstate-{account_id}-us-east-1"
+        s3.head_bucket(Bucket=state_bucket)
+        r = s3.list_objects_v2(Bucket=state_bucket, MaxKeys=5)
         keys = [o["Key"] for o in r.get("Contents", [])]
         return "Verified", f"state bucket exists, keys={keys}"
     except Exception as e:
diff --git a/scripts/push_consumer_image.py b/scripts/push_consumer_image.py
index 2ad0394..b5c1261 100644
--- a/scripts/push_consumer_image.py
+++ b/scripts/push_consumer_image.py
@@ -29,7 +29,7 @@ import boto3
 
 REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent
 ENV_FILE = REPO_ROOT / ".env.secrets"
-AWS_ACCOUNT_ID = "581513795199"
+AWS_ACCOUNT_ID = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
 AWS_REGION = "us-east-1"
 ECR_REPO_NAME = "acdl-microservice"
 IMAGE_TAG = "latest"
diff --git a/terraform/bootstrap/apply_iam_baseline.py b/terraform/bootstrap/apply_iam_baseline.py
index 90db766..dc5ed08 100644
--- a/terraform/bootstrap/apply_iam_baseline.py
+++ b/terraform/bootstrap/apply_iam_baseline.py
@@ -30,7 +30,7 @@ import boto3
 
 ROOT = Path(__file__).resolve().parent.parent.parent
 POLICY_PATH = ROOT / "terraform" / "bootstrap" / "spike_runner_policy.json"
-ACCOUNT = "581513795199"
+ACCOUNT = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
 USER = "acdl-spike-runner"
 POLICY_NAME = "acdl-spike-runner-policy"
 POLICY_ARN = f"arn:aws:iam::{ACCOUNT}:policy/{POLICY_NAME}"
diff --git a/terraform/bootstrap/create_state_backend.py b/terraform/bootstrap/create_state_backend.py
index f880ebb..c255794 100644
--- a/terraform/bootstrap/create_state_backend.py
+++ b/terraform/bootstrap/create_state_backend.py
@@ -30,9 +30,9 @@ import boto3
 
 
 REGION = os.environ.get("AWS_DEFAULT_REGION", "us-east-1")
-STATE_BUCKET = "acdl-tfstate-581513795199-us-east-1"
+ACCOUNT_ID = os.environ.get("ACDL_AWS_ACCOUNT_ID", "581513795199")
+STATE_BUCKET = f"acdl-tfstate-{ACCOUNT_ID}-us-east-1"
 OUTBOX_TABLE = "acdl-outbox"
-ACCOUNT_ID = "581513795199"
 
 
 def main():