diff --git a/build/ci.go b/build/ci.go
index e6022666c8..ae5df7587f 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -667,7 +667,7 @@ func doDebianSource(cmdline []string) {
 	maybeSkipArchive(env)
 
 	// Import the signing key.
-	if key := getenvBase64("PPA_SIGNING_KEY"); len(key) > 0 {
+	if key := getenvBase64("BUILD_PPA_SIGNING_KEY"); len(key) > 0 {
 		gpg := exec.Command("gpg", "--import")
 		gpg.Stdin = bytes.NewReader(key)
 		build.MustRun(gpg)
diff --git a/internal/build/env.go b/internal/build/env.go
index 8c050c3f82..dd0453e695 100644
--- a/internal/build/env.go
+++ b/internal/build/env.go
@@ -92,7 +92,7 @@ func Env() Environment {
 			IsCronJob:     os.Getenv("APPVEYOR_SCHEDULED_BUILD") == "True",
 		}
 
-	case os.Getenv("CI") == "true" && os.Getenv("ETH_BUILDBOT") == "true":
+	case os.Getenv("BUILD_ETH_BUILDBOT") == "true":
 		// For buildbot, the branch variable is the branch OR tag, and
 		// we can distinguish them by the git refspec.
 		var branch, tag string