diff --git a/postsubmit-cloudbuild.yaml b/postsubmit-cloudbuild.yaml
new file mode 100644
index 0000000..ad5a077
--- /dev/null
+++ b/postsubmit-cloudbuild.yaml
@@ -0,0 +1,62 @@
+substitutions:
+    _TAG_NAME: ${COMMIT_SHA}
+    _BUILD_TOOLS_CACHE: 'https://storage.googleapis.com/cos-infra-prod_cloudbuild/cos-tools-cache'
+steps:
+- name: 'gcr.io/cloud-builders/docker'
+  entrypoint: 'bash'
+  args:
+  - '-c'
+  - |
+    cat <<EOF | docker build -t bazel -
+    FROM gcr.io/cloud-builders/bazel
+    RUN apt-get update && apt-get install -y mtools dosfstools
+    EOF
+- name: 'bazel'
+  args: [ 'test', '--test_output=all', '--remote_cache=${_BUILD_TOOLS_CACHE}', '--google_default_credentials', '--spawn_strategy=standalone','--','...','-//src/pkg/tools/...' ]
+- name: 'golang'
+  entrypoint: 'bash'
+  args: [ './run_unit_tests.sh' ]
+#  Run cos-customizer integration tests
+- name: 'gcr.io/cloud-builders/gcloud'
+  entrypoint: 'bash'
+  args: [ './run_tests.sh', '-p', '$PROJECT_ID']
+- name: 'gcr.io/cloud-builders/gcloud'
+  entrypoint: 'bash'
+  args:
+  - '-c'
+  - |
+    # File that contains failures.
+    failure_file=failure.log
+    touch ${failure_file}
+
+    for d in src/cmd/*/; do
+      config="${d}cloudbuild.yaml"
+      if [[ ! -f "${config}" ]]; then
+        continue
+      fi
+
+      echo "Building $d ... "
+      (
+        logfile="${d::-1}.log"
+        gcloud builds submit --config=${config} --project=${PROJECT_ID} --substitutions=_OUTPUT_PROJECT=${_OUTPUT_PROJECT},TAG_NAME=${_TAG_NAME} > ${logfile} 2>&1
+        if [[ $? -ne 0 ]]; then
+          echo "$d failed" | tee -a ${failure_file}
+          cat ${logfile}
+        else
+          echo "$d finished"
+        fi
+      ) &
+    done
+    wait
+
+    # Check if there is any failure.
+    if [[ -s ${failure_file} ]]; then
+      echo
+      echo "Some builds failed:"
+      cat ${failure_file}
+      echo "Exiting."
+      exit 1
+    fi
+    echo "All builds succeeded."
+
+timeout: 7200s
diff --git a/run_tests.sh b/run_tests.sh
index 5835f13..12cb774 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -67,7 +67,7 @@
 
 start_build() {
   local -r config="$1"
-  gcloud builds submit --config="${config}" --project="${PROJECT}" --async --format='value(ID)' .
+  gcloud builds submit --config="${config}" --project="${PROJECT}" --substitutions=_PROJECT_NAME="${PROJECT_NAME}" --async --format='value(ID)' .
 }
 
 wait_for_build() {
@@ -104,6 +104,7 @@
     usage
     return 1
   fi
+  PROJECT_NAME=${PROJECT//google.com:/elgoog_com_}
   for config in testing/*.yaml; do
     build_ids+=("$(start_build "${config}")")
   done
diff --git a/testing/deprecate_test.yaml b/testing/deprecate_test.yaml
index 572cd18..6e1122a 100644
--- a/testing/deprecate_test.yaml
+++ b/testing/deprecate_test.yaml
@@ -28,7 +28,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['finish-image-build',
diff --git a/testing/disable_auto_update_test.yaml b/testing/disable_auto_update_test.yaml
index 5a724b5..9367df8 100644
--- a/testing/disable_auto_update_test.yaml
+++ b/testing/disable_auto_update_test.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -40,6 +40,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_32'
diff --git a/testing/env_test.yaml b/testing/env_test.yaml
index 11b1a8e..da37a80 100644
--- a/testing/env_test.yaml
+++ b/testing/env_test.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -39,6 +39,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_8'
diff --git a/testing/extend_oem_test.yaml b/testing/extend_oem_test.yaml
index 152ebed..8a20ea7 100644
--- a/testing/extend_oem_test.yaml
+++ b/testing/extend_oem_test.yaml
@@ -20,13 +20,13 @@
   - '-c'
   - |
     test_list=("gcloud builds submit --config=testing/extend_oem_test/extend_oem_test.yaml\
-                  --substitutions=_OEM_SIZE=1G,_DISK_SIZE=11,_OEM_SIZE_TH=900 --async --format='value(ID)' ." 
+                  --substitutions=_OEM_SIZE=1G,_DISK_SIZE=11,_OEM_SIZE_TH=900,_PROJECT_NAME=${_PROJECT_NAME} --async --format='value(ID)' ."
                "gcloud builds submit --config=testing/extend_oem_test/extend_oem_test.yaml\
-                  --substitutions=_OEM_SIZE=2G,_DISK_SIZE=12,_OEM_SIZE_TH=1700 --async --format='value(ID)' ."   
+                  --substitutions=_OEM_SIZE=2G,_DISK_SIZE=12,_OEM_SIZE_TH=1700,_PROJECT_NAME=${_PROJECT_NAME} --async --format='value(ID)' ."
                "gcloud builds submit --config=testing/extend_oem_test/extend_oem_test.yaml\
-                  --substitutions=_OEM_SIZE=10G,_DISK_SIZE=20,_OEM_SIZE_TH=8192 --async --format='value(ID)' ." 
+                  --substitutions=_OEM_SIZE=10G,_DISK_SIZE=20,_OEM_SIZE_TH=8192,_PROJECT_NAME=${_PROJECT_NAME} --async --format='value(ID)' ."
                 "gcloud builds submit --config=testing/extend_oem_test/extend_oem_test.yaml\
-                  --substitutions=_OEM_SIZE=1024G,_DISK_SIZE=1034,_OEM_SIZE_TH=838861 --async --format='value(ID)' .")
+                  --substitutions=_OEM_SIZE=1024G,_DISK_SIZE=1034,_OEM_SIZE_TH=838861,_PROJECT_NAME=${_PROJECT_NAME} --async --format='value(ID)' .")
     build_ids=()
     exit_code=0
     for test in "${test_list[@]}"; do
diff --git a/testing/extend_oem_test/extend_oem_test.yaml b/testing/extend_oem_test/extend_oem_test.yaml
index dea2b5a..908f688 100644
--- a/testing/extend_oem_test/extend_oem_test.yaml
+++ b/testing/extend_oem_test/extend_oem_test.yaml
@@ -30,7 +30,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -46,6 +46,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_32'
diff --git a/testing/gpu_test.yaml b/testing/gpu_test.yaml
index 5cfcc19..253c248 100644
--- a/testing/gpu_test.yaml
+++ b/testing/gpu_test.yaml
@@ -20,19 +20,19 @@
   - '-c'
   - |
     test_list=("gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
-                  --substitutions=_DRIVER_VERSION=450.51.06,_INPUT_IMAGE=cos-81-12871-1196-0\
+                  --substitutions=_DRIVER_VERSION=450.51.06,_INPUT_IMAGE=cos-81-12871-1196-0,_PROJECT_NAME=${_PROJECT_NAME}\
                   --async --format='value(ID)' ."
                "gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
-                  --substitutions=_DRIVER_VERSION=450.51.06,_INPUT_IMAGE=cos-rc-85-13310-1040-0\
+                  --substitutions=_DRIVER_VERSION=450.51.06,_INPUT_IMAGE=cos-rc-85-13310-1040-0,_PROJECT_NAME=${_PROJECT_NAME}\
                   --async --format='value(ID)' ."
                 "gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
-                  --substitutions=_DRIVER_VERSION=460.32.03,_INPUT_IMAGE=cos-89-16108-403-42\
+                  --substitutions=_DRIVER_VERSION=460.32.03,_INPUT_IMAGE=cos-89-16108-403-42,_PROJECT_NAME=${_PROJECT_NAME}\
                   --async --format='value(ID)' ."
                 "gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
-                  --substitutions=_DRIVER_VERSION=450.172.01,_INPUT_IMAGE=cos-93-16623-171-1\
+                  --substitutions=_DRIVER_VERSION=450.172.01,_INPUT_IMAGE=cos-93-16623-171-1,_PROJECT_NAME=${_PROJECT_NAME}\
                   --async --format='value(ID)' ."
                 "gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
-                  --substitutions=_DRIVER_VERSION=470.82.01,_INPUT_IMAGE=cos-97-16919-29-2\
+                  --substitutions=_DRIVER_VERSION=470.82.01,_INPUT_IMAGE=cos-97-16919-29-2,_PROJECT_NAME=${_PROJECT_NAME}\
                   --async --format='value(ID)' .")
     build_ids=()
     exit_code=0
diff --git a/testing/gpu_test/gpu_test.yaml b/testing/gpu_test/gpu_test.yaml
index d97fe5c..954a88e 100644
--- a/testing/gpu_test/gpu_test.yaml
+++ b/testing/gpu_test/gpu_test.yaml
@@ -38,7 +38,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['install-gpu',
@@ -57,6 +57,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', '-var:vm_workflow',
          './gpu_vm.wf.json', 'testing/util/run_test.wf.json']
 options:
diff --git a/testing/gpu_test_deps_dir.yaml b/testing/gpu_test_deps_dir.yaml
index 27acdf4..dc6f4e5 100644
--- a/testing/gpu_test_deps_dir.yaml
+++ b/testing/gpu_test_deps_dir.yaml
@@ -22,6 +22,6 @@
   args: ["-m", "cp", "gs://nvidia-drivers-us-public/tesla/418.67/NVIDIA-Linux-x86_64-418.67.run", "deps_dir"]
 - name: 'gcr.io/cloud-builders/gcloud'
   args: ["builds", "submit", "--config=testing/gpu_test/gpu_test.yaml",
-         "--substitutions=_DRIVER_VERSION=NVIDIA-Linux-x86_64-418.67.run,_INPUT_IMAGE=cos-dev-83-12998-0-0,_DEPS_DIR=deps_dir",
+         "--substitutions=_DRIVER_VERSION=NVIDIA-Linux-x86_64-418.67.run,_INPUT_IMAGE=cos-dev-83-12998-0-0,_DEPS_DIR=deps_dir,_PROJECT_NAME=${_PROJECT_NAME}",
          "."]
 timeout: "7200s"
diff --git a/testing/image_test.yaml b/testing/image_test.yaml
index cb82e30..2efe976 100644
--- a/testing/image_test.yaml
+++ b/testing/image_test.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['finish-image-build',
diff --git a/testing/install_packages_remote_pkgspec_test.yaml b/testing/install_packages_remote_pkgspec_test.yaml
index 66bcfac..448a159 100644
--- a/testing/install_packages_remote_pkgspec_test.yaml
+++ b/testing/install_packages_remote_pkgspec_test.yaml
@@ -23,17 +23,17 @@
 - name: 'gcr.io/cloud-builders/docker'
   args: ['build', '-f', 'src/cmd/cos_customizer/Dockerfile', '-t', 'cos_customizer', '.']
 - name: 'gcr.io/cloud-builders/gsutil'
-  args: [ '-m', 'cp', '${_INPUT_PKGSPEC}', 'gs://${PROJECT_ID}_cloudbuild/' ]
+  args: [ '-m', 'cp', '${_INPUT_PKGSPEC}', 'gs://${_PROJECT_NAME}_cloudbuild/' ]
 - name: 'cos_customizer'
   args: ['start-image-build',
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['anthos-installer-install',
-         '-pkgspec-url=gs://${PROJECT_ID}_cloudbuild/${_INPUT_PKGSPEC_FILE}']
+         '-pkgspec-url=gs://${_PROJECT_NAME}_cloudbuild/${_INPUT_PKGSPEC_FILE}']
 - name: 'cos_customizer'
   args: ['finish-image-build',
          '-zone=us-west1-b',
@@ -44,9 +44,10 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 - name: 'gcr.io/cloud-builders/gsutil'
-  args: ['rm', 'gs://${PROJECT_ID}_cloudbuild/kubernetes_pkg_spec.tar.gz' ]
+  args: ['rm', 'gs://${_PROJECT_NAME}_cloudbuild/kubernetes_pkg_spec.tar.gz' ]
 options:
   machineType: 'N1_HIGHCPU_32'
 timeout: '7200s'
diff --git a/testing/install_packages_test.yaml b/testing/install_packages_test.yaml
index 20e4535..cfb280a 100644
--- a/testing/install_packages_test.yaml
+++ b/testing/install_packages_test.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['anthos-installer-install',
@@ -39,6 +39,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_32'
diff --git a/testing/machine_type_test.yaml b/testing/machine_type_test.yaml
index 0ea2322..c3eef48 100644
--- a/testing/machine_type_test.yaml
+++ b/testing/machine_type_test.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -39,6 +39,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_8'
diff --git a/testing/milestone_test.yaml b/testing/milestone_test.yaml
index e74e31e..e3b13a8 100644
--- a/testing/milestone_test.yaml
+++ b/testing/milestone_test.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-milestone=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['finish-image-build',
@@ -35,6 +35,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_8'
diff --git a/testing/multi_script_test.yaml b/testing/multi_script_test.yaml
index 9f30632..402db62 100644
--- a/testing/multi_script_test.yaml
+++ b/testing/multi_script_test.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -41,6 +41,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_8'
diff --git a/testing/network_subnet_test.yaml b/testing/network_subnet_test.yaml
index 1304232..169e99e 100644
--- a/testing/network_subnet_test.yaml
+++ b/testing/network_subnet_test.yaml
@@ -32,7 +32,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -48,6 +48,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
   args: [ 'gcloud', 'compute', 'networks', 'subnets',
diff --git a/testing/parallel_test.yaml b/testing/parallel_test.yaml
index 5620f4e..6ce914a 100644
--- a/testing/parallel_test.yaml
+++ b/testing/parallel_test.yaml
@@ -31,7 +31,7 @@
          '-build-context=testing/${_TEST_1}',
          '-image-name=${_INPUT_IMAGE_1}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-${_TEST_1}-$BUILD_ID']
 - name: 'cos_customizer'
   waitFor: 'test-1-start-build'
@@ -53,6 +53,7 @@
   id: 'test-1-test-build'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-t1-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST_1}/preload_test.cfg', 'testing/util/run_test.wf.json']
 # TEST_2 workflow
 - name: 'busybox'
@@ -66,7 +67,7 @@
          '-build-context=testing/${_TEST_2}',
          '-image-name=${_INPUT_IMAGE_2}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-${_TEST_2}-$BUILD_ID']
 - name: 'cos_customizer'
   waitFor: 'test-2-start-build'
@@ -95,6 +96,7 @@
   id: 'test-2-test-build'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-t2-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST_2}/preload_test.cfg', '-var:vm_workflow',
          './gpu_vm.wf.json', 'testing/util/run_test.wf.json']
 options:
diff --git a/testing/seal_oem_test.yaml b/testing/seal_oem_test.yaml
index 5a41d7d..7c4554a 100644
--- a/testing/seal_oem_test.yaml
+++ b/testing/seal_oem_test.yaml
@@ -20,11 +20,11 @@
   - '-c'
   - |
     test_list=("gcloud builds submit --config=testing/seal_oem_test/seal_oem_test.yaml\
-                  --substitutions=_OEM_SIZE=50M,_DISK_SIZE=10,_OEM_SIZE_TH=40 --async --format='value(ID)' ." 
+                  --substitutions=_OEM_SIZE=50M,_DISK_SIZE=10,_OEM_SIZE_TH=40,_PROJECT_NAME="${_PROJECT_NAME}" --async --format='value(ID)' ."
                "gcloud builds submit --config=testing/seal_oem_test/seal_oem_test.yaml\
-                  --substitutions=_OEM_SIZE=1G,_DISK_SIZE=12,_OEM_SIZE_TH=900 --async --format='value(ID)' ."   
+                  --substitutions=_OEM_SIZE=1G,_DISK_SIZE=12,_OEM_SIZE_TH=900,_PROJECT_NAME="${_PROJECT_NAME}" --async --format='value(ID)' ."
                "gcloud builds submit --config=testing/seal_oem_test/seal_oem_test.yaml\
-                  --substitutions=_OEM_SIZE=2G,_DISK_SIZE=14,_OEM_SIZE_TH=1700 --async --format='value(ID)' ." )
+                  --substitutions=_OEM_SIZE=2G,_DISK_SIZE=14,_OEM_SIZE_TH=1700,_PROJECT_NAME="${_PROJECT_NAME}" --async --format='value(ID)' ." )
     build_ids=()
     exit_code=0
     for test in "${test_list[@]}"; do
diff --git a/testing/seal_oem_test/run_test.wf.json b/testing/seal_oem_test/run_test.wf.json
index b4ebdbd..e2b3a4a 100644
--- a/testing/seal_oem_test/run_test.wf.json
+++ b/testing/seal_oem_test/run_test.wf.json
@@ -4,8 +4,10 @@
     "image_name": { "Required": true, "Description": "Name of image to test" },
     "image_project": { "Required": true, "Description": "Project of image to test" },
     "test_cfg": { "Required": true, "Description": "Cloud-config to use for the test" },
-    "vm_workflow": { "Value": "./vm.wf.json", "Description": "Workflow to use for creating the test VM" }
+    "vm_workflow": { "Value": "./vm.wf.json", "Description": "Workflow to use for creating the test VM" },
+    "daisy_gcs_bucket": { "Required": true, "Description": "Daisy bucket to be used for the test" }
   },
+  "GCSPath": "gs://${daisy_gcs_bucket}/",
   "Steps": {
     "setup-disk": {
       "CreateDisks": [
diff --git a/testing/seal_oem_test/seal_oem_test.yaml b/testing/seal_oem_test/seal_oem_test.yaml
index 7989337..1a0d3c4 100644
--- a/testing/seal_oem_test/seal_oem_test.yaml
+++ b/testing/seal_oem_test/seal_oem_test.yaml
@@ -30,7 +30,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -48,6 +48,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-default_timeout=15m', '-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_32'
diff --git a/testing/seal_oem_test_no_oem_size.yaml b/testing/seal_oem_test_no_oem_size.yaml
index e209a39..3f1ffc6 100644
--- a/testing/seal_oem_test_no_oem_size.yaml
+++ b/testing/seal_oem_test_no_oem_size.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -40,6 +40,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-default_timeout=15m', '-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_32'
diff --git a/testing/seal_oem_test_no_size.yaml b/testing/seal_oem_test_no_size.yaml
index 0f73214..0e13ce8 100644
--- a/testing/seal_oem_test_no_size.yaml
+++ b/testing/seal_oem_test_no_size.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -41,6 +41,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-default_timeout=15m', '-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_32'
diff --git a/testing/seal_oem_test_timeout.yaml b/testing/seal_oem_test_timeout.yaml
index 4235840..13e54c6 100644
--- a/testing/seal_oem_test_timeout.yaml
+++ b/testing/seal_oem_test_timeout.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -50,7 +50,8 @@
   - |
     /daisy -default_timeout=5m -project=$PROJECT_ID -zone=us-west1-b \
     -var:image_name preload-test-$BUILD_ID -var:image_project $PROJECT_ID \
-    -var:test_cfg /preload_test.cfg /run_test.wf.json | tee /build.log
+    -var:daisy_gcs_bucket $_PROJECT_NAME-daisy-bkt -var:test_cfg /preload_test.cfg \
+    /run_test.wf.json | tee /build.log
     if ( grep "did not complete within the specified timeout" /build.log > /dev/null ); \
     then exit 0; else echo "error: timemout expected"; exit 1; fi
 options:
diff --git a/testing/smoke_test.yaml b/testing/smoke_test.yaml
index d412432..04c2792 100644
--- a/testing/smoke_test.yaml
+++ b/testing/smoke_test.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -38,6 +38,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_8'
diff --git a/testing/timeout_test.yaml b/testing/timeout_test.yaml
index 8f9f05e..aa3043d 100644
--- a/testing/timeout_test.yaml
+++ b/testing/timeout_test.yaml
@@ -18,6 +18,6 @@
   args:
   - '-c'
   - |
-    gcloud builds submit --config=testing/timeout_test/timeout_test.yaml . | tee /build.log
+    gcloud builds submit --config=testing/timeout_test/timeout_test.yaml --substitutions=_PROJECT_NAME=${_PROJECT_NAME} . | tee /build.log
     grep "did not complete within the specified timeout" /build.log > /dev/null
 timeout: '7200s'
diff --git a/testing/timeout_test/timeout_test.yaml b/testing/timeout_test/timeout_test.yaml
index 94be555..f954d89 100644
--- a/testing/timeout_test/timeout_test.yaml
+++ b/testing/timeout_test/timeout_test.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
diff --git a/testing/toolbox_test.yaml b/testing/toolbox_test.yaml
index f489204..8b9c3ab 100644
--- a/testing/toolbox_test.yaml
+++ b/testing/toolbox_test.yaml
@@ -24,7 +24,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=${_INPUT_IMAGE}',
          '-image-project=${_INPUT_PROJECT}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -38,6 +38,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_8'
diff --git a/testing/ubuntu_ova_test.yaml b/testing/ubuntu_ova_test.yaml
index bf7a0d7..4a3d6fd 100644
--- a/testing/ubuntu_ova_test.yaml
+++ b/testing/ubuntu_ova_test.yaml
@@ -47,13 +47,13 @@
     qemu-img convert -O raw *.vmdk disk.raw
     tar czf ubuntu_gce.tar.gz disk.raw
 - name: 'gcr.io/cloud-builders/gsutil'
-  args: ['cp', 'ova/ubuntu_gce.tar.gz', 'gs://${PROJECT_ID}_cloudbuild/build-ova-${BUILD_ID}/ubuntu_gce.tar.gz']
+  args: ['cp', 'ova/ubuntu_gce.tar.gz', 'gs://${_PROJECT_NAME}_cloudbuild/build-ova-${BUILD_ID}/ubuntu_gce.tar.gz']
 - name: 'gcr.io/cloud-builders/gcloud'
   args: ['compute', 'images', 'create', 'input-${BUILD_ID}',
-         '--source-uri', 'gs://${PROJECT_ID}_cloudbuild/build-ova-${BUILD_ID}/ubuntu_gce.tar.gz',
+         '--source-uri', 'gs://${_PROJECT_NAME}_cloudbuild/build-ova-${BUILD_ID}/ubuntu_gce.tar.gz',
          '--project', '${PROJECT_ID}']
 - name: 'gcr.io/cloud-builders/gsutil'
-  args: ['rm', 'gs://${PROJECT_ID}_cloudbuild/build-ova-${BUILD_ID}/ubuntu_gce.tar.gz']
+  args: ['rm', 'gs://${_PROJECT_NAME}_cloudbuild/build-ova-${BUILD_ID}/ubuntu_gce.tar.gz']
 
 # Run cos-customizer
 - name: 'cos_customizer'
@@ -61,7 +61,7 @@
          '-build-context=testing/${_TEST}',
          '-image-name=input-${BUILD_ID}',
          '-image-project=${PROJECT_ID}',
-         '-gcs-bucket=${PROJECT_ID}_cloudbuild',
+         '-gcs-bucket=${_PROJECT_NAME}_cloudbuild',
          '-gcs-workdir=customizer-$BUILD_ID']
 - name: 'cos_customizer'
   args: ['run-script',
@@ -81,6 +81,7 @@
 - name: 'gcr.io/compute-image-tools/daisy'
   args: ['-project=$PROJECT_ID', '-zone=us-west1-b', '-var:image_name',
          'preload-test-$BUILD_ID', '-var:image_project', '$PROJECT_ID',
+         '-var:daisy_gcs_bucket', '${_PROJECT_NAME}-daisy-bkt',
          '-var:test_cfg', '../${_TEST}/preload_test.cfg', 'testing/util/run_test.wf.json']
 options:
   machineType: 'N1_HIGHCPU_8'
diff --git a/testing/util/run_test.wf.json b/testing/util/run_test.wf.json
index b4ebdbd..e2b3a4a 100644
--- a/testing/util/run_test.wf.json
+++ b/testing/util/run_test.wf.json
@@ -4,8 +4,10 @@
     "image_name": { "Required": true, "Description": "Name of image to test" },
     "image_project": { "Required": true, "Description": "Project of image to test" },
     "test_cfg": { "Required": true, "Description": "Cloud-config to use for the test" },
-    "vm_workflow": { "Value": "./vm.wf.json", "Description": "Workflow to use for creating the test VM" }
+    "vm_workflow": { "Value": "./vm.wf.json", "Description": "Workflow to use for creating the test VM" },
+    "daisy_gcs_bucket": { "Required": true, "Description": "Daisy bucket to be used for the test" }
   },
+  "GCSPath": "gs://${daisy_gcs_bucket}/",
   "Steps": {
     "setup-disk": {
       "CreateDisks": [