diff --git a/build/mark-stable-release.sh b/build/mark-stable-release.sh
index 534d02a98b6..3a204cadd7f 100755
--- a/build/mark-stable-release.sh
+++ b/build/mark-stable-release.sh
@@ -16,6 +16,10 @@
 
 # Marks the current stable version
 
+set -o errexit
+set -o nounset
+set -o pipefail
+
 if [[ -z "$1" ]]; then
   echo "Usage: $0 <version>"
   exit 1
@@ -28,7 +32,7 @@ fi
 
 STABLE_FILE_LOCATION="kubernetes-release/release/stable.txt"
 
-version_file=$(mktemp -t stable)
+version_file=$(mktemp -t stable.XXXXXX)
 
 echo $1 >> ${version_file}
 echo "Uploading stable version $1 to google storage"