diff --git a/.cloudbuild/ci/integration-tests.yaml b/.cloudbuild/ci/integration-tests.yaml
index 61deb3012cf..4ef85011140 100644
--- a/.cloudbuild/ci/integration-tests.yaml
+++ b/.cloudbuild/ci/integration-tests.yaml
@@ -1,7 +1,8 @@
 timeout: 25m
+
 options:
   machineType: E2_HIGHCPU_32
-  
+
   # This build needs to run in environments where the _GITHUB_DEPLOY_KEY_SRC
   # substitution is defined, but also environments where it isn't. The
   # ALLOW_LOOSE option disables GCBs strict checking of substitution usage,
@@ -9,19 +10,19 @@ options:
   substitution_option: ALLOW_LOOSE
 
 steps:
-  # Run the integration tests. Actual content of this job depends on the changes 
+  # Run the integration tests. Actual content of this job depends on the changes
   # detected in the PR
   - name: quay.io/gravitational/teleport-buildbox:teleport10
     id: run-tests
     dir: /workspace/.cloudbuild/scripts
     entrypoint: bash
-    args: 
+    args:
       - -c
       - |
         go run ./cmd/integration-tests          \
           -target "$_BASE_BRANCH"               \
           -bucket test-logs                     \
-          -build $BUILD_ID                      \
+          -build "$BUILD_ID"                    \
           -key-secret "$_GITHUB_DEPLOY_KEY_SRC" \
-          -a "test-logs/*.json"          
+          -a "test-logs/*.json"
     timeout: 25m
diff --git a/.cloudbuild/ci/unit-tests.yaml b/.cloudbuild/ci/unit-tests.yaml
index ae9935c1008..86e840c64cc 100644
--- a/.cloudbuild/ci/unit-tests.yaml
+++ b/.cloudbuild/ci/unit-tests.yaml
@@ -1,28 +1,28 @@
 timeout: 25m
 
 options:
-  machineType: 'E2_HIGHCPU_32'
-  
-  # This build needs to run in environments where the _GITHUB_DEPLOY_KEY_SRC  
+  machineType: E2_HIGHCPU_32
+
+  # This build needs to run in environments where the _GITHUB_DEPLOY_KEY_SRC
   # substitution is defined, but also environments where it isn't. The
   # ALLOW_LOOSE option disables GCBs strict checking of substitution usage,
   # so that the build will still run if _GITHUB_DEPLOY_KEY_SRC is not defined.
   substitution_option: ALLOW_LOOSE
-  
+
 steps:
-  # Run the unit tests. Actual content of this job depends on the changes 
+  # Run the unit tests. Actual content of this job depends on the changes
   # detected in the PR
   - name: quay.io/gravitational/teleport-buildbox:teleport10
     id: run-tests
     dir: /workspace/.cloudbuild/scripts
-    entrypoint: bash 
-    args: 
+    entrypoint: bash
+    args:
       - -c
       - |
         go run ./cmd/unit-tests                 \
-          -target $_BASE_BRANCH                 \
+          -target "$_BASE_BRANCH"               \
           -bucket test-logs                     \
-          -build $BUILD_ID                      \
+          -build "$BUILD_ID"                    \
           -key-secret "$_GITHUB_DEPLOY_KEY_SRC" \
           -a "test-logs/*.json"
     timeout: 25m