diff --git a/build/cloudbuild.java.yaml b/build/cloudbuild.java.yaml
index 7d50e62c..a8ea219b 100644
--- a/build/cloudbuild.java.yaml
+++ b/build/cloudbuild.java.yaml
@@ -26,5 +26,5 @@ steps:
 
 availableSecrets:
   secretManager:
-    - versionName: projects/datcom-ci/secrets/dc-api-key/versions/latest
+    - versionName: projects/$PROJECT_ID/secrets/dc-api-key/versions/latest
       env: DC_API_KEY
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index c3bd8f85..bba3d340 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -6,12 +6,16 @@ steps:
       - DC_API_KEY
 
   - name: 'gcr.io/cloud-builders/gsutil'
-    args: ['cp', 'tool/target/datacommons-import-tool-0.1-SNAPSHOT-jar-with-dependencies.jar', 'gs://datacommons_public/import_tools/import-tool.jar']
+    args: ['cp', 'tool/target/datacommons-import-tool-0.1-SNAPSHOT-jar-with-dependencies.jar', 'gs://${_GCS_BUCKET}/import_tools/import-tool.jar']
 
   - name: 'gcr.io/cloud-builders/gcloud'
-    args: ['builds', 'triggers', 'run', 'dc-import-executor', '--branch=master', '--substitutions', '_DOCKER_IMAGE=us-docker.pkg.dev/datcom-ci/gcr.io/dc-import-executor']
+    args: ['builds', 'triggers', 'run', 'dc-import-executor', '--branch=master', '--substitutions', '_DOCKER_IMAGE=${_DOCKER_IMAGE}']
+
+substitutions:
+  _GCS_BUCKET: 'datacommons_public'
+  _DOCKER_IMAGE: 'us-docker.pkg.dev/${PROJECT_ID}/gcr.io/dc-import-executor'
 
 availableSecrets:
   secretManager:
-    - versionName: projects/datcom-ci/secrets/dc-api-key/versions/latest
+    - versionName: projects/$PROJECT_ID/secrets/dc-api-key/versions/latest
       env: DC_API_KEY