diff --git a/.github/workflows/android-cd.yml b/.github/workflows/android-cd.yml
new file mode 100644
index 00000000..89c8acad
--- /dev/null
+++ b/.github/workflows/android-cd.yml
@@ -0,0 +1,32 @@
+name: build-android-app
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: macos-latest
+    environment: Android CI/CD
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Create LocalProperites
+        env:
+          CREDENTIAL_WEB_CLIENT_ID: ${{ secrets.CREDENTIAL_WEB_CLIENT_ID }}
+          MISSION_MATE_BASE_URL: ${{ secrets.MISSION_MATE_BASE_URL }}
+        run: |
+          echo CREDENTIAL_WEB_CLIENT_ID=\"$CREDENTIAL_WEB_CLIENT_ID\" > ./local.properties
+          echo MISSION_MATE_BASE_URL=\"$MISSION_MATE_BASE_URL\" >> ./local.properties
+
+      - name: Generate Keystore file from Github Secrets
+        env:
+          KEYSTORE: ${{ secrets.KEYSTORE_BASE64 }}
+        run: |
+          echo "$KEYSTORE" > ./mission-mate-keystore.b64
+          base64 -d -i ./mission-mate-keystore.b64 > ./mission-mate-keystore.jks  
+
+      - name: Build with Gradle
+        run: fastlane beta
diff --git a/.github/workflows/build-android-app.yml b/.github/workflows/android-ci.yml
similarity index 100%
rename from .github/workflows/build-android-app.yml
rename to .github/workflows/android-ci.yml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 79b53483..da20419f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,6 +1,5 @@
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import java.io.FileInputStream
-import java.util.Properties
 
 plugins {
     alias(libs.plugins.android.application)
@@ -9,10 +8,6 @@ plugins {
     alias(libs.plugins.kotlin.ksp)
 }
 
-//val keystorePropertiesFile = rootProject.file("keystore.properties")
-//val keystoreProperties = Properties()
-//keystoreProperties.load(FileInputStream(keystorePropertiesFile))
-
 android {
     namespace = "com.goalpanzi.mission_mate"
     compileSdk = 34
@@ -30,19 +25,18 @@ android {
         }
     }
 
-//    signingConfigs {
-//        create("release") {
-//            keyAlias = keystoreProperties["keyAlias"] as String
-//            keyPassword = keystoreProperties["keyPassword"] as String
-//            storeFile = file(keystoreProperties["storeFile"] as String)
-//            storePassword = keystoreProperties["storePassword"] as String
-//        }
-//    }
+    signingConfigs {
+        create("release") {
+            storeFile = file("../mission-mate-keystore.jks")
+            storePassword = gradleLocalProperties(rootDir, providers).getProperty("SIGNING_STORE_PASSWORD")
+            keyAlias =  gradleLocalProperties(rootDir, providers).getProperty("SIGNING_KEY_ALIAS")
+            keyPassword =  gradleLocalProperties(rootDir, providers).getProperty("SIGNING_KEY_PASSWORD")
+        }
+    }
 
     buildTypes {
         release {
-            getByName("debug")
-//            signingConfig = signingConfigs.getByName("release")
+            signingConfig = signingConfigs.getByName("release")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"