diff --git a/copilot/environments/addons/assessment-import-queue.yml b/copilot/environments/addons/assessment-import-queue.yml
index b52a70d..b45fabd 100644
--- a/copilot/environments/addons/assessment-import-queue.yml
+++ b/copilot/environments/addons/assessment-import-queue.yml
@@ -14,7 +14,7 @@ Resources:
   AssessmentImportQueue:
     Type: AWS::SQS::Queue
     Properties:
-      QueueName: !Sub ${FifoQueueName}.fifo
+      QueueName: !Sub ${FifoQueueName}-${Env}.fifo
       FifoQueue: true
       RedrivePolicy:
         deadLetterTargetArn: !GetAtt DeadLetterQueue.Arn
@@ -23,18 +23,28 @@ Resources:
     Type: AWS::SQS::Queue
     Properties:
       FifoQueue: true
+      QueueName: !Sub ${FifoQueueName}-${Env}-deadletter.fifo
+
 
 
 Outputs:
   AssessmentImportQueueURL:
     Description: Queue URL for Fifo queue
     Value: !Ref AssessmentImportQueue
+    Export:
+      Name: !Sub ${App}-${Env}-AssessmentImportQueueURL
   AssessmentImportQueueArn:
     Description: Queue Arn for FIFO queue
     Value: !GetAtt AssessmentImportQueue.Arn
+    Export:
+      Name: !Sub ${App}-${Env}-AssessmentImportQueueArn
   DeadLetterQueueURL:
     Description: "URL of dead-letter queue"
     Value: !Ref DeadLetterQueue
+    Export:
+      Name: !Sub ${App}-${Env}-DeadLetterQueueURL
   DeadLetterQueueARN:
     Description: "ARN of dead-letter queue"
     Value: !GetAtt DeadLetterQueue.Arn
+    Export:
+      Name: !Sub ${App}-${Env}-DeadLetterQueueARN
diff --git a/copilot/environments/addons/form-uploads.yml b/copilot/environments/addons/form-uploads.yml
index d1532d1..bd25fee 100644
--- a/copilot/environments/addons/form-uploads.yml
+++ b/copilot/environments/addons/form-uploads.yml
@@ -13,6 +13,7 @@ Resources:
     Type: AWS::S3::Bucket
     Properties:
       AccessControl: Private
+      BucketName: !Sub fsd-form-uploads-${Env}
       BucketEncryption:
         ServerSideEncryptionConfiguration:
         - ServerSideEncryptionByDefault:
@@ -52,7 +53,7 @@ Outputs:
     Description: "The name of a user-defined bucket."
     Value: !Ref FormUploadsBucket
     Export:
-      Name: !Sub fsd-form-uploads-${Env}
+      Name: !Sub ${App}-${Env}-FormUploadsBucket
   FormUploadsBucketARN:
     Description: "The ARN of the form-uploads bucket."
     Value: !GetAtt FormUploadsBucket.Arn
diff --git a/copilot/environments/addons/funding-service-magic-links.yml b/copilot/environments/addons/funding-service-magic-links.yml
index 6c22866..51d1f45 100644
--- a/copilot/environments/addons/funding-service-magic-links.yml
+++ b/copilot/environments/addons/funding-service-magic-links.yml
@@ -83,6 +83,8 @@ Outputs:
   RedisEndpoint:
     Description: The endpoint of the redis cluster
     Value: !GetAtt 'Redis.RedisEndpoint.Address'
+    Export:
+      Name: !Sub ${App}-${Env}-RedisEndpoint
   RedisInstanceURI:
     Description: "The URI of the redis cluster."
     Value:
@@ -91,3 +93,5 @@ Outputs:
       - PASSWORD: !Join [ "",  [ '{{resolve:secretsmanager:', !Ref 'RedisSecret', ":SecretString:password}}" ]]
         HOSTNAME: !GetAtt 'Redis.RedisEndpoint.Address'
         PORT: !GetAtt 'Redis.RedisEndpoint.Port'
+    Export:
+      Name: !Sub ${App}-${Env}-RedisInstanceURI