diff --git a/.kokoro/build-with-appengine.sh b/.kokoro/build-with-appengine.sh
index 241025d237..c721aa7c43 100755
--- a/.kokoro/build-with-appengine.sh
+++ b/.kokoro/build-with-appengine.sh
@@ -30,6 +30,7 @@ VERSION=$(echo $PROJECT | sed 's_appengine/__')
 VERSION=$(echo $VERSION | sed 's_/flexible\|/standard__')
 
 export GAE_VERSION=$VERSION
+export GCLOUD_STORAGE_BUCKET=docs-samples-${VERSION}
 
 # Register post-test cleanup
 function cleanup {
diff --git a/circle.yml b/circle.yml
index d7c6d29f1c..e5147bc8c0 100644
--- a/circle.yml
+++ b/circle.yml
@@ -106,8 +106,8 @@ deployment:
       - node scripts/build "appengine/metadata/flexible"
       - node scripts/build "appengine/metadata/standard"
       - node scripts/build "appengine/static-files"
-      - GCLOUD_STORAGE_BUCKET=docs-samples-gae-test-$(uuid); node scripts/build "appengine/storage/flexible"
-      - GCLOUD_STORAGE_BUCKET=docs-samples-gae-test-$(uuid); node scripts/build "appengine/storage/standard"
+      - GCLOUD_STORAGE_BUCKET=docs-samples-storage-flexible; node scripts/build "appengine/storage/flexible"
+      - GCLOUD_STORAGE_BUCKET=docs-samples-storage-standard; node scripts/build "appengine/storage/standard"
       - node scripts/build "auth"
       - node scripts/build "appengine/pubsub"
       - export GCP_QUEUE=nodejs-test-queue-do-not-delete; node scripts/build "cloudtasks"