diff --git a/ci/buildkite.yml b/ci/buildkite.yml
index 0551ec4007d388..6594f87bad138a 100644
--- a/ci/buildkite.yml
+++ b/ci/buildkite.yml
@@ -36,3 +36,9 @@ steps:
   - trigger: "solana-snap"
     branches: "!pull/*"
     async: true
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        TRIGGERED_BUILDKITE_TAG: "${BUILDKITE_TAG}"
diff --git a/ci/snap.sh b/ci/snap.sh
index 52a46a9683b5aa..0262fe9b299a58 100755
--- a/ci/snap.sh
+++ b/ci/snap.sh
@@ -7,7 +7,11 @@ if [[ -z $BUILDKITE_BRANCH ]] || ./ci/is-pr.sh; then
   DRYRUN="echo"
 fi
 
-if [[ -z "$BUILDKITE_TAG" ]]; then
+# BUILDKITE_TAG is the normal environment variable set by Buildkite.  However
+# when this script is run from a triggered pipeline, TRIGGERED_BUILDKITE_TAG is
+# used instead of BUILDKITE_TAG (due to Buildkite limitations that prevents
+# BUILDKITE_TAG from propagating through to triggered pipelines)
+if [[ -z "$BUILDKITE_TAG" && -z "$TRIGGERED_BUILDKITE_TAG" ]]; then
   SNAP_CHANNEL=edge
 else
   SNAP_CHANNEL=beta