diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 25d3e0d1..3a4cd7bf 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -34,6 +34,6 @@ steps:
           workdir: /go/src/github.com/replicatedhq/troubleshoot
           volumes:
             - "/var/run/docker.sock:/var/run/docker.sock"
-          environment:
-            - "GITHUB_TOKEN"
             - "/var/lib/buildkite-agent/.docker/config.json:/home/builder/.docker/config.json"
+          environment:
+            - "GITHUB_TOKEN_TROUBLESHOOT"
diff --git a/Makefile b/Makefile
index f11be560..9c2e2c39 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,7 @@ snapshot-release:
 	docker push replicated/troubleshoot-manager:alpha
 
 .PHONY: release
+release: export GITHUB_TOKEN=$$GITHUB_TOKEN_TROUBLESHOOT
 release:
 	curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --config deploy/.goreleaser.yml