diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 0d5f1424..6658c7c3 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -5,16 +5,28 @@
 # Build debug version of the RiotX application, from the develop branch and the features branches
 
 steps:
-  - label: "Assemble Debug version"
+  - label: "Assemble GPlay Debug version"
     agents:
       # We use a medium sized instance instead of the normal small ones because
       # gradle build is long
       queue: "medium"
     commands:
       - "./gradlew clean lintGplayRelease assembleGplayDebug --stacktrace"
-      - "./gradlew lintFdroidRelease assembleFdroidDebug --stacktrace"
     artifact_paths:
       - "vector/build/outputs/apk/gplay/debug/*.apk"
+    branches: "develop feature/*"
+    plugins:
+      - docker#v3.1.0:
+          image: "runmymind/docker-android-sdk"
+
+  - label: "Assemble FDroid Debug version"
+    agents:
+      # We use a medium sized instance instead of the normal small ones because
+      # gradle build is long
+      queue: "medium"
+    commands:
+      - "./gradlew clean lintFdroidRelease assembleFdroidDebug --stacktrace"
+    artifact_paths:
       - "vector/build/outputs/apk/fdroid/debug/*.apk"
     branches: "develop feature/*"
     plugins: