diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 355fa0e6b2..c9fe56348b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -12,9 +12,7 @@ steps:
       queue: "medium"
     commands:
       # Workaround to set env variables from Buildkite. If we do not do that, the gradle script does not see the Buildkite env variables
-      - "export BUILDKITE_BRANCH=$BUILDKITE_BRANCH"
-      - "export BUILDKITE_BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER"
-      - "./gradlew clean lintGplayRelease assembleGplayDebug --stacktrace"
+      - "BUILDKITE_BRANCH=\"$BUILDKITE_BRANCH\" BUILDKITE_BUILD_NUMBER=\"$BUILDKITE_BUILD_NUMBER\" ./gradlew clean lintGplayRelease assembleGplayDebug --stacktrace"
     artifact_paths:
       - "vector/build/outputs/apk/gplay/debug/*.apk"
     branches: "!master"
@@ -29,9 +27,7 @@ steps:
       queue: "medium"
     commands:
       # Workaround to set env variables from Buildkite. If we do not do that, the gradle script does not see the Buildkite env variables
-      - "export BUILDKITE_BRANCH=$BUILDKITE_BRANCH"
-      - "export BUILDKITE_BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER"
-      - "./gradlew clean lintFdroidRelease assembleFdroidDebug --stacktrace"
+      - "BUILDKITE_BRANCH=\"$BUILDKITE_BRANCH\" BUILDKITE_BUILD_NUMBER=\"$BUILDKITE_BUILD_NUMBER\" ./gradlew clean lintFdroidRelease assembleFdroidDebug --stacktrace"
     artifact_paths:
       - "vector/build/outputs/apk/fdroid/debug/*.apk"
     branches: "!master"
@@ -46,9 +42,7 @@ steps:
       queue: "medium"
     commands:
       # Workaround to set env variables from Buildkite. If we do not do that, the gradle script does not see the Buildkite env variables
-      - "export BUILDKITE_BRANCH=$BUILDKITE_BRANCH"
-      - "export BUILDKITE_BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER"
-      - "./gradlew clean assembleGplayRelease --stacktrace"
+      - "BUILDKITE_BRANCH=\"$BUILDKITE_BRANCH\" BUILDKITE_BUILD_NUMBER=\"$BUILDKITE_BUILD_NUMBER\" ./gradlew clean assembleGplayRelease --stacktrace"
     artifact_paths:
       - "vector/build/outputs/apk/gplay/release/*.apk"
     branches: "master"