diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml
index 5ebe0216..6f95b165 100644
--- a/.github/workflows/deploy_terraform.yml
+++ b/.github/workflows/deploy_terraform.yml
@@ -57,6 +57,7 @@ jobs:
   # image:
   #   uses: ./.github/workflows/_build_docker_image.yml
   #   with:
+        # ecr_repo will need to changed to dynamic env in the future
   #     ecr_repo: address2uprn-dev
   #     aws_region: ${{ env.AWS_REGION }}
   #     dockerfile_path: backend/address2UPRN/Dockerfile
diff --git a/infrastructure/terraform/shared/locals.tf b/infrastructure/terraform/shared/locals.tf
deleted file mode 100644
index e69de29b..00000000
diff --git a/infrastructure/terraform/shared/main.tf b/infrastructure/terraform/shared/main.tf
index f6475362..acb1b070 100644
--- a/infrastructure/terraform/shared/main.tf
+++ b/infrastructure/terraform/shared/main.tf
@@ -294,7 +294,8 @@ output "ses_dns_records" {
 ################################################
 module "address2uprn_state_bucket" {
   source      = "../modules/tf_state_bucket"
-  bucket_name = "address2uprn-terraform-state"
+  bucket_name = "address2uprn-terraform-state-${var.stage}"
+
 }
 
 output "address2uprn_state_bucket_name" {
@@ -304,6 +305,8 @@ output "address2uprn_state_bucket_name" {
 module "address2uprn_registry" {
   source = "../modules/container_registry"
   name   = "address2uprn-${var.stage}"
+  stage = var.stage
+
 }
 
 output "address2uprn_repository_url" {