diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 84b49d33..36211445 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -11,6 +11,13 @@ jobs:
   release-signing-build:
     name: Release Signing Build
     runs-on: ubuntu-latest
+    env:
+      RELEASE_KEYSTORE_PATH: ${{ secrets.RELEASE_KEYSTORE_PATH }}
+      RELEASE_SIGNING_PASSWORD: ${{ secrets.RELEASE_SIGNING_PASSWORD }}
+      RELEASE_SIGNING_USERNAME: ${{ secrets.RELEASE_SIGNING_PASSWORD }}
+      RELEASE_SIGNING_ALIAS: ${{ secrets.RELEASE_SIGNING_ALIAS }}
+      GOOGLE_SERVER_CLIENT_ID: ${{ secrets.GOOGLE_SERVER_CLIENT_ID }}
+      PIPELESS_AUTH_TOKEN: ${{ secrets.PIPELESS_AUTH_TOKEN }}
 
     steps:
       - uses: actions/checkout@v3
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 94b954bc..e4d6854b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -18,8 +18,8 @@ android {
         versionCode = 52
         versionName = libs.versions.versionname.toString()
 
-        val googleServerClientId: String = properties["GOOGLE_SERVER_CLIENT_ID"] as String
-        val pipelessAuthToken: String = properties["PIPELESS_AUTH_TOKEN"] as String
+        val googleServerClientId: String = (properties["GOOGLE_SERVER_CLIENT_ID"] ?: System.getenv("GOOGLE_SERVER_CLIENT_ID")) as String
+        val pipelessAuthToken: String = (properties["PIPELESS_AUTH_TOKEN"] ?: System.getenv("PIPELESS_AUTH_TOKEN")) as String
 
         buildConfigField("String", "GOOGLE_SERVER_CLIENT_ID", googleServerClientId)
         buildConfigField("String", "PIPELESS_AUTH_TOKEN", pipelessAuthToken)
@@ -53,7 +53,7 @@ android {
 
     signingConfigs {
         create("release") {
-            storeFile= file("keystore.jks")
+            storeFile = file("keystore.jks")
             storePassword = System.getenv("RELEASE_SIGNING_PASSWORD")
             keyPassword = System.getenv("RELEASE_SIGNING_PASSWORD")
             keyAlias = System.getenv("RELEASE_SIGNING_ALIAS")
@@ -90,7 +90,7 @@ android {
         }
     }
 
-    namespace  = "com.kafka.user"
+    namespace = "com.kafka.user"
 
     lint {
         baseline = file("lint-baseline.xml")
@@ -100,7 +100,7 @@ android {
         ignoreTestSources = true
         // Make the build fail on any lint errors
         abortOnError = true
-        checkDependencies =  true
+        checkDependencies = true
         warning += "AutoboxingStateCreation"
     }