diff --git a/.gitignore b/.gitignore
index 29b579d8c..c99ad7125 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,7 @@ lib/generated_plugin_registrant.dart
 
 # Exceptions to above rules.
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+
+/key.jks
+/android/key.properties
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b51f2f72..4df9deca2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,9 +28,14 @@ build_web:
       - build/web/
 
 
-build_android:
+build_android_fdroid:
   stage: coverage
   script:
+    - cd android && echo $FDROID_KEY | base64 --decode --ignore-garbage > key.jks && cd ..
+    - cd android && echo "storePassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
+    - cd android && echo "keyPassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
+    - cd android && echo "keyAlias=key" >> key.properties && cd ..
+    - cd android && echo "storeFile=../key.jks" >> key.properties && cd ..
     - flutter build apk --release
   artifacts:
     when: on_success
diff --git a/android/app/build.gradle b/android/app/build.gradle
index a7e3441b5..faf963e7a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,6 +25,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     compileSdkVersion 28
 
@@ -37,7 +43,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "chat.fluffy.fluffychat"
         minSdkVersion 16
         targetSdkVersion 28
@@ -46,11 +51,21 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    }
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
+            minifyEnabled true
+            useProguard true
+
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index d5fc4f239..95392b894 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="fluffychat"
+        android:label="FluffyChat"
         android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"
diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
new file mode 100644
index 000000000..d24d7f10a
--- /dev/null
+++ b/android/proguard-rules.pro
@@ -0,0 +1,8 @@
+## Flutter wrapper
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.**  { *; }
+-keep class io.flutter.util.**  { *; }
+-keep class io.flutter.view.**  { *; }
+-keep class io.flutter.**  { *; }
+-keep class io.flutter.plugins.**  { *; }
+-dontwarn io.flutter.embedding.**
\ No newline at end of file