diff --git a/release/build-release.sh b/release/build-release.sh
index 19a9a48fb21..061203e3f62 100755
--- a/release/build-release.sh
+++ b/release/build-release.sh
@@ -21,7 +21,7 @@ set -eu
 set -o pipefail
 IFS=$'\n\t'
 
-SCRIPT_DIR=$(cd $(dirname $0); pwd)
+SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd)
 
 INSTANCE_PREFIX=$1
 
diff --git a/release/release.sh b/release/release.sh
index 70650f2d390..241444ff2ad 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -23,7 +23,7 @@
 # exit on any error
 set -e
 
-SCRIPT_DIR=$(cd $(dirname $0); pwd)
+SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd)
 
 source $SCRIPT_DIR/config.sh