diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 8938cd560..6384b130d 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -29,6 +29,11 @@ android {
 		githubRelease{
 			initWith release
 		}
+		nightly{
+			versionNameSuffix '-nightly'
+			applicationIdSuffix '.nightly'
+			signingConfig signingConfigs.debug
+		}
 		playRelease{
 			initWith release
 			minifyEnabled true
diff --git a/mastodon/src/main/res/values/strings_mo.xml b/mastodon/src/main/res/values/strings_mo.xml
index 03de465a7..f9b033e55 100644
--- a/mastodon/src/main/res/values/strings_mo.xml
+++ b/mastodon/src/main/res/values/strings_mo.xml
@@ -2,6 +2,7 @@
 <resources>
     <string name="mo_app_name" translatable="false">Moshidon</string>
     <string name="mo_app_name_debug" translatable="false">Moshidon Debug</string>
+    <string name="mo_app_name_nightly" translatable="false">Moshidon Nightly</string>
 
     <string name="mo_color_palette_nord">Nord</string>
     <string name="mo_app_username" translatable="false">\@moshidon</string>
diff --git a/mastodon/src/nightly/AndroidManifest.xml b/mastodon/src/nightly/AndroidManifest.xml
new file mode 100644
index 000000000..cb2da7db1
--- /dev/null
+++ b/mastodon/src/nightly/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	package="org.joinmastodon.android">
+
+	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+
+
+	<application
+		tools:replace="android:label"
+		android:label="@string/mo_app_name_nightly">
+		<!--		<receiver android:name=".updater.GithubSelfUpdaterImpl$InstallerStatusReceiver" android:exported="false"/>-->
+		<!--		<receiver android:name=".updater.GithubSelfUpdaterImpl$AfterUpdateRestartReceiver" android:exported="true" android:enabled="false">-->
+		<!--			<intent-filter>-->
+		<!--				<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>-->
+		<!--			</intent-filter>-->
+		<!--		</receiver>-->
+	</application>
+
+</manifest>
\ No newline at end of file