diff --git a/infrastructure/terraform/main.tf b/infrastructure/terraform/main.tf
index 5f623313..d73d5ae9 100644
--- a/infrastructure/terraform/main.tf
+++ b/infrastructure/terraform/main.tf
@@ -86,6 +86,7 @@ resource "aws_db_instance" "default" {
 # Set up the bucket that recieve the csv uploads of properties to be retrofit
 module "s3_presignable_bucket" {
   source          = "./modules/s3_presignable_bucket"
+  bucketname      = "retrofit-plan-inputs-${var.stage}"
   environment     = var.stage
   allowed_origins = var.allowed_origins
 }
diff --git a/infrastructure/terraform/modules/s3_presignable_bucket/main.tf b/infrastructure/terraform/modules/s3_presignable_bucket/main.tf
index 4d92a6f3..e12a58bf 100644
--- a/infrastructure/terraform/modules/s3_presignable_bucket/main.tf
+++ b/infrastructure/terraform/modules/s3_presignable_bucket/main.tf
@@ -1,5 +1,5 @@
 resource "aws_s3_bucket" "bucket" {
-  bucket = "retrofit-plan-inputs-${var.environment}"
+  bucket = var.bucketname
   acl    = "private"
 
   cors_rule {
@@ -24,7 +24,7 @@ resource "aws_s3_bucket" "bucket" {
 }
 
 resource "aws_iam_user" "presign_frontend_user" {
-  name = "presign_frontend_user-${var.environment}"
+  name = "presign_frontend_user-${var.bucketname}"
   path = "/system/"
 }
 
@@ -33,7 +33,7 @@ resource "aws_iam_access_key" "presign_frontend_user_access_key" {
 }
 
 resource "aws_secretsmanager_secret" "presign_frontend_user_access_key" {
-  name = "${var.environment}/presign_frontend/access_key"
+  name = "${var.bucketname}/presign_frontend/access_key"
 }
 
 resource "aws_secretsmanager_secret_version" "presign_frontend_user_access_key" {
@@ -42,7 +42,7 @@ resource "aws_secretsmanager_secret_version" "presign_frontend_user_access_key"
 }
 
 resource "aws_secretsmanager_secret" "presign_frontend_user_secret_key" {
-  name = "${var.environment}/presign_frontend/secret_key"
+  name = "${var.bucketname}/presign_frontend/secret_key"
 }
 
 resource "aws_secretsmanager_secret_version" "presign_frontend_user_secret_key" {
@@ -51,7 +51,7 @@ resource "aws_secretsmanager_secret_version" "presign_frontend_user_secret_key"
 }
 
 resource "aws_iam_user_policy" "presign_frontend_user_policy" {
-  name = "presign_frontend_user_policy-${var.environment}"
+  name = "presign_frontend_user_policy-${var.bucketname}"
   user = aws_iam_user.presign_frontend_user.name
 
   policy = <<EOF
diff --git a/infrastructure/terraform/modules/s3_presignable_bucket/variables.tf b/infrastructure/terraform/modules/s3_presignable_bucket/variables.tf
index 36be17ae..f50a0935 100644
--- a/infrastructure/terraform/modules/s3_presignable_bucket/variables.tf
+++ b/infrastructure/terraform/modules/s3_presignable_bucket/variables.tf
@@ -10,4 +10,9 @@ variable "environment" {
 variable "allowed_origins" {
   description = "Allowed origins for CORS"
   type        = list(string)
+}
+
+variable "bucketname" {
+  description = "The name of the bucket to create"
+  type        = string
 }
\ No newline at end of file