diff --git a/.circleci/config.yml b/.circleci/config.yml
index f3a6c3f92a..f08a2e1598 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -97,9 +97,8 @@ jobs:
           command: |
             mkdir -p dev/config
             cat \<< EOF > ./dev/config/cluster.yaml
-            cluster_name: cortex
+            cluster_name: cortex-nightly
             region: us-east-1
-            bucket: cortex-dev-nightly
             node_groups:
               - name: cpu
                 instance_type: m5.large
@@ -158,9 +157,8 @@ jobs:
           # using a variety of node groups to test the multi-instance-type cluster functionality
           command: |
             cat \<< EOF > ./cluster.yaml
-            cluster_name: cortex
+            cluster_name: cortex-nightly
             region: us-east-1
-            bucket: cortex-dev-nightly
             node_groups:
               - name: spot
                 instance_type: t3.medium
diff --git a/pkg/crds/controllers/batch/suite_test.go b/pkg/crds/controllers/batch/suite_test.go
index fd100df7c8..24ac42b0e0 100644
--- a/pkg/crds/controllers/batch/suite_test.go
+++ b/pkg/crds/controllers/batch/suite_test.go
@@ -110,6 +110,7 @@ var _ = BeforeSuite(func(done Done) {
 	Expect(err).ToNot(HaveOccurred())
 
 	clusterConfig.AccountID = accountID
+	clusterConfig.Bucket = clusterconfig.BucketName(accountID, clusterConfig.ClusterName, clusterConfig.Region)
 
 	operatorMetadata := &clusterconfig.OperatorMetadata{
 		APIVersion:          consts.CortexVersion,