diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 2396bb469..600ef7e8e 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -44,6 +44,28 @@ android {
 				keyPassword = properties.getProperty('SIGNING_KEY_PASSWORD')
 			}
 		}
+
+		release{
+			storeFile = file("keystore/release_keystore.jks")
+			storePassword System.getenv("RELEASE_SIGNING_STORE_PASSWORD")
+			if (storePassword == null) {
+				Properties properties = new Properties()
+				properties.load(project.rootProject.file('local.properties').newDataInputStream())
+				storePassword = properties.getProperty('RELEASE_SIGNING_STORE_PASSWORD')
+			}
+			keyAlias System.getenv("RELEASE_SIGNING_KEY_ALIAS")
+			if (keyAlias == null) {
+				Properties properties = new Properties()
+				properties.load(project.rootProject.file('local.properties').newDataInputStream())
+				keyAlias = properties.getProperty('RELEASE_SIGNING_KEY_ALIAS')
+			}
+			keyPassword System.getenv("RELEASE_SIGNING_KEY_PASSWORD")
+			if (keyPassword == null) {
+				Properties properties = new Properties()
+				properties.load(project.rootProject.file('local.properties').newDataInputStream())
+				keyPassword = properties.getProperty('RELEASE_SIGNING_KEY_PASSWORD')
+			}
+		}
 	}
 
 	buildTypes {
@@ -81,7 +103,10 @@ android {
 			versionNameSuffix '-play'
 		}
 		githubRelease { initWith release }
-		fdroidRelease { initWith release }
+		fdroidRelease {
+			initWith release
+			signingConfig signingConfigs.release
+		}
 	}
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_17