diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index 7ec9248e8c..b2ac5251f1 100755
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -566,10 +566,15 @@ function ensure-temp-dir {
 #   SALT_TAR_URL
 function upload-server-tars() {
   SERVER_BINARY_TAR_URL=
+  SERVER_BINARY_TAR_HASH=
   SALT_TAR_URL=
+  SALT_TAR_HASH=
 
   ensure-temp-dir
 
+  SERVER_BINARY_TAR_HASH=$(sha1sum-file "${SERVER_BINARY_TAR}")
+  SALT_TAR_HASH=$(sha1sum-file "${SALT_TAR}")
+
   if [[ -z ${AWS_S3_BUCKET-} ]]; then
       local project_hash=
       local key=$(aws configure get aws_access_key_id)
diff --git a/cluster/common.sh b/cluster/common.sh
index 4bc7ed7e2e..957439a49b 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -441,3 +441,11 @@ function build-runtime-config() {
       fi
   fi
 }
+
+function sha1sum-file() {
+  if which shasum >/dev/null 2>&1; then
+    shasum -a1 "$1" | awk '{ print $1 }'
+  else
+    sha1sum "$1" | awk '{ print $1 }'
+  fi
+}
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 43c12eb903..330532cb06 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -115,14 +115,6 @@ function detect-project () {
   fi
 }
 
-function sha1sum-file() {
-  if which shasum >/dev/null 2>&1; then
-    shasum -a1 "$1" | awk '{ print $1 }'
-  else
-    sha1sum "$1" | awk '{ print $1 }'
-  fi
-}
-
 function already-staged() {
   local -r file=$1
   local -r newsum=$2