diff --git a/.buildkite/heartbeat/scripts/integration-gotests.sh b/.buildkite/heartbeat/scripts/integration-gotests.sh
index bb56795e87be..8eab0e8b5d88 100755
--- a/.buildkite/heartbeat/scripts/integration-gotests.sh
+++ b/.buildkite/heartbeat/scripts/integration-gotests.sh
@@ -2,11 +2,14 @@
 
 set -euo pipefail
 
+# Remove when custom image is set up
 source .buildkite/env-scripts/linux-env.sh
 
 echo "--- Executing Integration Tests"
+# Remove when custom image is set up
 sudo chmod -R go-w heartbeat/
 
 cd heartbeat
+# Remove when custom image is set up
 umask 0022
 mage goIntegTest
diff --git a/.buildkite/heartbeat/scripts/integration-pytests.sh b/.buildkite/heartbeat/scripts/integration-pytests.sh
index 0427d89663d9..729df5ae6f61 100755
--- a/.buildkite/heartbeat/scripts/integration-pytests.sh
+++ b/.buildkite/heartbeat/scripts/integration-pytests.sh
@@ -2,11 +2,14 @@
 
 set -euo pipefail
 
+# Remove when custom image is set up
 source .buildkite/env-scripts/linux-env.sh
 
 echo "--- Executing Integration Tests"
+# Remove when custom image is set up
 sudo chmod -R go-w heartbeat/
 
 cd heartbeat
+# Remove when custom image is set up
 umask 0022
 mage pythonIntegTest
diff --git a/.buildkite/heartbeat/scripts/unit-tests.sh b/.buildkite/heartbeat/scripts/unit-tests.sh
index edbcb37efecb..4b746da2d57c 100755
--- a/.buildkite/heartbeat/scripts/unit-tests.sh
+++ b/.buildkite/heartbeat/scripts/unit-tests.sh
@@ -2,11 +2,14 @@
 
 set -euo pipefail
 
+# Remove when custom image is set up
 source .buildkite/env-scripts/linux-env.sh
 
 echo "--- Running Unit Tests"
+# Remove when custom image is set up
 sudo chmod -R go-w heartbeat/
 
 cd heartbeat
+# Remove when custom image is set up
 umask 0022
 mage build unitTest