diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
new file mode 100644
index 00000000..667a4bd8
--- /dev/null
+++ b/.buildkite/pipeline.yml
@@ -0,0 +1,41 @@
+# Use Docker file from https://hub.docker.com/r/runmymind/docker-android-sdk
+# Last docker plugin version can be found here:
+# https://github.com/buildkite-plugins/docker-buildkite-plugin/releases
+
+# Build debug version of the RiotX application, from the develop branch and the features branches
+
+steps:
+- label: "Assemble 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"
+  - "vector/build/outputs/apk/fdroid/debug/*.apk"
+  branches: "develop feature/*"
+  plugins:
+  - docker#v3.1.0:
+      image: "runmymind/docker-android-sdk"
+
+- label: "Build Google Play unsigned APK"
+    agents:
+      # We use a medium sized instance instead of the normal small ones because
+      # gradle build is long
+      queue: "medium"
+    commands:
+    - "./gradlew clean assembleGplayRelease --stacktrace"
+    artifact_paths:
+    - "vector/build/outputs/apk/gplay/release/*.apk"
+    branches: "master"
+    plugins:
+    - docker#v3.1.0:
+        image: "runmymind/docker-android-sdk"
+
+# Code quality
+
+- label: "Code quality"
+  command: "./tools/check/check_code_quality.sh"
diff --git a/README.md b/README.md
index b95058c3..2fe92f58 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Jenkins](https://img.shields.io/jenkins/s/https/matrix.org/jenkins/view/MatrixView/job/RiotXAndroidDevelop.svg)](https://matrix.org/jenkins/view/MatrixView/job/RiotXAndroidDevelop/)
+[![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android)
 [![Weblate](https://translate.riot.im/widgets/riot-android/-/svg-badge.svg)](https://translate.riot.im/engage/riot-android/?utm_source=widget)
 [![RiotX Android Matrix room #riot-android:matrix.org](https://img.shields.io/matrix/riotx:matrix.org.svg?label=%23RiotX:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#riotx:matrix.org)
 [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=alert_status)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
@@ -11,7 +11,7 @@ RiotX is an Android Matrix Client currently in development. The application is n
 
 It's based on a new Matrix SDK, written in Kotlin.
 
-Download nightly build here: [![Jenkins](https://img.shields.io/jenkins/s/https/matrix.org/jenkins/view/MatrixView/job/RiotXAndroidDevelop.svg)](https://matrix.org/jenkins/view/MatrixView/job/RiotXAndroidDevelop/)
+Download nightly build here: [![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop)
 
 Matrix Room: [![RiotX Android Matrix room #riot-android:matrix.org](https://img.shields.io/matrix/riotx:matrix.org.svg?label=%23RiotX:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#riotx:matrix.org)
 
diff --git a/build.gradle b/build.gradle
index 479eb154..d07b849e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ sonarqube {
         property "sonar.projectVersion", project(":vector").android.defaultConfig.versionName
         property "sonar.sourceEncoding", "UTF-8"
         property "sonar.links.homepage", "https://github.com/vector-im/riotX-android/"
-        property "sonar.links.ci", "https://matrix.org/jenkins/view/MatrixView/job/RiotXAndroidDevelop/"
+        property "sonar.links.ci", "https://buildkite.com/matrix-dot-org/riotx-android"
         property "sonar.links.scm", "https://github.com/vector-im/riotX-android/"
         property "sonar.links.issue", "https://github.com/vector-im/riotX-android/issues"
         property "sonar.organization", "new_vector_ltd_organization"