diff --git a/release/create.sh b/release/create.sh
index 7c6b0cae..8ec96446 100755
--- a/release/create.sh
+++ b/release/create.sh
@@ -4,13 +4,13 @@ set -euo pipefail
 
 ARTIFACT_CLI_VERSION="v0.5.2"
 WHEN_CLI_VERSION="v1.0.5"
-SPC_CLI_VERSION="v1.9.1"
+SPC_CLI_VERSION="v1.9.2"
 TEST_RESULTS_CLI_VERSION="v0.4.12"
 
 ARTIFACT_CLI_URL="https://github.com/semaphoreci/artifact/releases/download/$ARTIFACT_CLI_VERSION"
 SPC_CLI_URL="https://github.com/semaphoreci/spc/releases/download/$SPC_CLI_VERSION"
-WHEN_CLI_URL="https://github.com/renderedtext/when/releases/download/$WHEN_CLI_VERSION"
 TEST_RESULTS_CLI_URL="https://github.com/semaphoreci/test-results/releases/download/$TEST_RESULTS_CLI_VERSION"
+WHEN_CLI_URL="https://github.com/renderedtext/when/releases/download/$WHEN_CLI_VERSION"
 
 create_tarball() {
   tarball_name=$1
@@ -117,6 +117,14 @@ self_hosted::pack() {
   include_external_darwin_binary $ARTIFACT_CLI_URL "artifact" /tmp/self-hosted-Darwin
   include_external_linux_binary $TEST_RESULTS_CLI_URL "test-results" /tmp/self-hosted-Linux
   include_external_darwin_binary $TEST_RESULTS_CLI_URL "test-results" /tmp/self-hosted-Darwin
+  include_external_linux_binary $SPC_CLI_URL "spc" /tmp/self-hosted-Linux
+  include_external_darwin_binary $SPC_CLI_URL "spc" /tmp/self-hosted-Darwin
+
+  curl -s -L --retry 5 $WHEN_CLI_URL/when -o /tmp/self-hosted-Linux/toolbox/when
+  chmod +x /tmp/self-hosted-Linux/toolbox/when
+  curl -s -L --retry 5 $WHEN_CLI_URL/when -o /tmp/self-hosted-Darwin/toolbox/when
+  chmod +x /tmp/self-hosted-Darwin/toolbox/when
+
   cp ~/$SEMAPHORE_GIT_DIR/cache-cli/bin/linux/cache /tmp/self-hosted-Linux/toolbox/
   cp ~/$SEMAPHORE_GIT_DIR/cache-cli/bin/darwin/cache /tmp/self-hosted-Darwin/toolbox/
 }