diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9ae1571..3271f44 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -18,7 +18,7 @@ env:
   AWS_ROLE_TO_ASSUME: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/coderunner-pipeline-role
   REPOSITORY_NAME: coderunner
   CLOUDFORMATION_ROLE_ARN: arn:aws:iam::254837279431:role/coderunner-cloudformation-role
-  CODERUNNER_BUCKET: coderunner
+  CODERUNNER_BUCKET: coderunner-${{ secrets.AWS_ACCOUNT_ID }}
 
 jobs:
   unit-test:
diff --git a/infrastructure.yml b/infrastructure.yml
index ebedca4..1787d0c 100644
--- a/infrastructure.yml
+++ b/infrastructure.yml
@@ -30,7 +30,7 @@ Resources:
   CodeRunnerBucket:
     Type: AWS::S3::Bucket
     Properties:
-      BucketName: coderunner
+      BucketName: !Sub 'coderunner-${AWS::AccountId}'
 
   ClusterCredentials:
     Type: AWS::SecretsManager::Secret