diff --git a/gradle.properties b/gradle.properties
index 6de52be607..2af9214ed5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,3 +32,8 @@ signing.element.storePath=pathTo.keystore
 signing.element.storePassword=Secret
 signing.element.keyId=Secret
 signing.element.keyPassword=Secret
+
+# Dummy values for signing secrets / nightly
+signing.element.nightly.storePassword=Secret
+signing.element.nightly.keyId=Secret
+signing.element.nightly.keyPassword=Secret
diff --git a/vector/build.gradle b/vector/build.gradle
index dd160f9574..45f1178c44 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -228,6 +228,12 @@ android {
             storeFile file('./signature/debug.keystore')
             storePassword 'android'
         }
+        nightly {
+            keyAlias project.property("signing.element.nightly.keyId")
+            keyPassword project.property("signing.element.nightly.keyPassword")
+            storeFile file('./signature/nightly.keystore')
+            storePassword project.property("signing.element.nightly.storePassword")
+        }
         release {
             keyAlias project.property("signing.element.keyId")
             keyPassword project.property("signing.element.keyPassword")
@@ -268,6 +274,14 @@ android {
             }
             // signingConfig signingConfigs.release
         }
+
+        nightly {
+            initWith release
+            applicationIdSuffix ".nightly"
+            resValue "string", "app_name", "Element nightly"
+
+            signingConfig signingConfigs.nightly
+        }
     }
 
     flavorDimensions "store"
diff --git a/vector/signature/nightly.keystore b/vector/signature/nightly.keystore
new file mode 100644
index 0000000000..a0e9ba413b
Binary files /dev/null and b/vector/signature/nightly.keystore differ