diff --git a/fastlane/Appfile b/fastlane/Appfile
new file mode 100644
index 0000000000..811e38d972
--- /dev/null
+++ b/fastlane/Appfile
@@ -0,0 +1,2 @@
+json_key_file("../google-api-fastlane-release.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("de.spiritcroc.riotx") # e.g. com.krausefx.app
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
new file mode 100644
index 0000000000..02c15a58f9
--- /dev/null
+++ b/fastlane/Fastfile
@@ -0,0 +1,42 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+  keystore = ENV["keystore"]
+  keystore_pass = ENV["keystorepass"]
+  key_alias = ENV["keyalias"]
+  key_pass = ENV["keypass"]
+
+  desc "Runs all the tests"
+  lane :test do
+    gradle(task: "test")
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    gradle(
+        task: "clean assembleGplayRelease",
+        properties: {
+            "android.injected.signing.store.file": keystore,
+            "android.injected.signing.store.password": keystore_pass,
+            "android.injected.signing.key.alias": key_alias,
+            "android.injected.signing.key.password": key_pass
+        }
+    )
+    upload_to_play_store
+  end
+end
diff --git a/fastlane/README.md b/fastlane/README.md
new file mode 100644
index 0000000000..8f1119a8b0
--- /dev/null
+++ b/fastlane/README.md
@@ -0,0 +1,34 @@
+fastlane documentation
+================
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```
+xcode-select --install
+```
+
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew install fastlane`
+
+# Available Actions
+## Android
+### android test
+```
+fastlane android test
+```
+Runs all the tests
+### android deploy
+```
+fastlane android deploy
+```
+Deploy a new version to the Google Play
+
+----
+
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
+The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).