diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 64c61dee..ba079f22 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -43,12 +43,12 @@ jobs:
           echo "${{ secrets.ENV_FILE_DEVELOPMENT }}" > .env.development
           echo "${{ secrets.ENV_FILE_PRODUCTION }}" > .env.production
           echo "${{ secrets.ENV_FILE_STAGING }}" > .env.staging
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > ANDROID_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > ANDROID_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > ANDROID_GOOGLE_SERVICES_PRODUCTION
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > IOS_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > IOS_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > IOS_GOOGLE_SERVICES_PRODUCTION
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > google-services.development.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > google-services.staging.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > google-services.production.json
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > GoogleService-Info.development.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > GoogleService-Info.staging.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > GoogleService-Info.production.plist
 
       - name: Install Dependencies
         run: yarn
diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index 56158d5f..aed147ed 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -51,12 +51,12 @@ jobs:
           echo "${{ secrets.ENV_FILE_DEVELOPMENT }}" > .env.development
           echo "${{ secrets.ENV_FILE_PRODUCTION }}" > .env.production
           echo "${{ secrets.ENV_FILE_STAGING }}" > .env.staging
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > ANDROID_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > ANDROID_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > ANDROID_GOOGLE_SERVICES_PRODUCTION
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > IOS_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > IOS_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > IOS_GOOGLE_SERVICES_PRODUCTION
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > google-services.development.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > google-services.staging.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > google-services.production.json
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > GoogleService-Info.development.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > GoogleService-Info.staging.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > GoogleService-Info.production.plist
 
       - name: Install dependencies
         run: yarn install
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 15280bd2..8b1d8236 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -40,12 +40,12 @@ jobs:
           echo "${{ secrets.ENV_FILE_DEVELOPMENT }}" > .env.development
           echo "${{ secrets.ENV_FILE_PRODUCTION }}" > .env.production
           echo "${{ secrets.ENV_FILE_STAGING }}" > .env.staging
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > ANDROID_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > ANDROID_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > ANDROID_GOOGLE_SERVICES_PRODUCTION
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > IOS_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > IOS_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > IOS_GOOGLE_SERVICES_PRODUCTION
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > google-services.development.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > google-services.staging.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > google-services.production.json
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > GoogleService-Info.development.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > GoogleService-Info.staging.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > GoogleService-Info.production.plist
 
       - name: Install dependencies
         run: yarn install
diff --git a/GOOGLE_SERVICES_DEVELOPMENT b/GOOGLE_SERVICES_DEVELOPMENT
deleted file mode 100644
index d85f7fbd..00000000
--- a/GOOGLE_SERVICES_DEVELOPMENT
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  project_info: {
-    project_number: 987256491649,
-    project_id: xlog-e4b7b,
-    storage_bucket: xlog-e4b7b.appspot.com
-  },
-  client: [
-    {
-      client_info: {
-        mobilesdk_app_id: 1:987256491649:android:c54b8b1c0ba524bfea8780,
-        android_client_info: {
-          package_name: com.crossbell.xlog.development
-        }
-      },
-      oauth_client: [
-        {
-          client_id: 987256491649-ap3srir38inicf154pp5qubrbn1ehnbd.apps.googleusercontent.com,
-          client_type: 3
-        }
-      ],
-      api_key: [
-        {
-          current_key: AIzaSyBhDLw0XPcSQH8E41KH0GpjHjiGu3qA7xs
-        }
-      ],
-      services: {
-        appinvite_service: {
-          other_platform_oauth_client: [
-            {
-              client_id: 987256491649-ap3srir38inicf154pp5qubrbn1ehnbd.apps.googleusercontent.com,
-              client_type: 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  configuration_version: 1
-}
diff --git a/GOOGLE_SERVICES_PRODUCTION b/GOOGLE_SERVICES_PRODUCTION
deleted file mode 100644
index cd43e3c0..00000000
--- a/GOOGLE_SERVICES_PRODUCTION
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  project_info: {
-    project_number: 987256491649,
-    project_id: xlog-e4b7b,
-    storage_bucket: xlog-e4b7b.appspot.com
-  },
-  client: [
-    {
-      client_info: {
-        mobilesdk_app_id: 1:987256491649:android:e8465f8e34691ba5ea8780,
-        android_client_info: {
-          package_name: com.crossbell.xlog
-        }
-      },
-      oauth_client: [
-        {
-          client_id: 987256491649-ap3srir38inicf154pp5qubrbn1ehnbd.apps.googleusercontent.com,
-          client_type: 3
-        }
-      ],
-      api_key: [
-        {
-          current_key: AIzaSyBhDLw0XPcSQH8E41KH0GpjHjiGu3qA7xs
-        }
-      ],
-      services: {
-        appinvite_service: {
-          other_platform_oauth_client: [
-            {
-              client_id: 987256491649-ap3srir38inicf154pp5qubrbn1ehnbd.apps.googleusercontent.com,
-              client_type: 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  configuration_version: 1
-}
diff --git a/GOOGLE_SERVICES_STAGING b/GOOGLE_SERVICES_STAGING
deleted file mode 100644
index 73d4013c..00000000
--- a/GOOGLE_SERVICES_STAGING
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  project_info: {
-    project_number: 987256491649,
-    project_id: xlog-e4b7b,
-    storage_bucket: xlog-e4b7b.appspot.com
-  },
-  client: [
-    {
-      client_info: {
-        mobilesdk_app_id: 1:987256491649:android:b1f4c8385f374b4aea8780,
-        android_client_info: {
-          package_name: com.crossbell.xlog.staging
-        }
-      },
-      oauth_client: [
-        {
-          client_id: 987256491649-ap3srir38inicf154pp5qubrbn1ehnbd.apps.googleusercontent.com,
-          client_type: 3
-        }
-      ],
-      api_key: [
-        {
-          current_key: AIzaSyBhDLw0XPcSQH8E41KH0GpjHjiGu3qA7xs
-        }
-      ],
-      services: {
-        appinvite_service: {
-          other_platform_oauth_client: [
-            {
-              client_id: 987256491649-ap3srir38inicf154pp5qubrbn1ehnbd.apps.googleusercontent.com,
-              client_type: 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  configuration_version: 1
-}
diff --git a/scripts/set-app-config-env.js b/scripts/set-app-config-env.js
index 5033e340..c78b5c3d 100644
--- a/scripts/set-app-config-env.js
+++ b/scripts/set-app-config-env.js
@@ -4,11 +4,11 @@ const { version } = require("../package.json");
 
 function setAppConfigEnv() {
   const ENV = process.env.NODE_ENV ?? "production";
-  const IS_CI = process.env.EAS_BUILD === "true" || process.env.CI === "true";
+  const IS_EAS_CI = process.env.EAS_BUILD === "true";
 
   console.log("ENV:", process.env);
 
-  if (IS_CI) {
+  if (IS_EAS_CI) {
     dotenv.config({ path: process.env.ENV_FILE_COMMON });
     dotenv.config({ path: process.env[`ENV_FILE_${ENV.toUpperCase()}`] });
   }
@@ -28,24 +28,24 @@ function setAppConfigEnv() {
       host: HOST,
       scheme: `${SCHEME}.development`,
       icon: "./assets/icon.development.png",
-      androidGoogleServicesFile: IS_CI ? process.env.ANDROID_GOOGLE_SERVICES_DEVELOPMENT : "./google-services.development.json",
-      iosGoogleServicesFile: IS_CI ? process.env.IOS_GOOGLE_SERVICES_DEVELOPMENT : "./GoogleService-Info.development.plist",
+      androidGoogleServicesFile: IS_EAS_CI ? process.env.ANDROID_GOOGLE_SERVICES_DEVELOPMENT : "./google-services.development.json",
+      iosGoogleServicesFile: IS_EAS_CI ? process.env.IOS_GOOGLE_SERVICES_DEVELOPMENT : "./GoogleService-Info.development.plist",
     },
     staging: {
       name: "xLog-preview",
       host: HOST,
       scheme: `${SCHEME}.staging`,
       icon: "./assets/icon.staging.png",
-      androidGoogleServicesFile: IS_CI ? process.env.ANDROID_GOOGLE_SERVICES_STAGING : "./google-services.staging.json",
-      iosGoogleServicesFile: IS_CI ? process.env.IOS_GOOGLE_SERVICES_STAGING : "./GoogleService-Info.staging.plist",
+      androidGoogleServicesFile: IS_EAS_CI ? process.env.ANDROID_GOOGLE_SERVICES_STAGING : "./google-services.staging.json",
+      iosGoogleServicesFile: IS_EAS_CI ? process.env.IOS_GOOGLE_SERVICES_STAGING : "./GoogleService-Info.staging.plist",
     },
     production: {
       name: "xLog",
       host: HOST,
       scheme: SCHEME,
       icon: "./assets/icon.png",
-      androidGoogleServicesFile: IS_CI ? process.env.ANDROID_GOOGLE_SERVICES_PRODUCTION : "./google-services.production.json",
-      iosGoogleServicesFile: IS_CI ? process.env.IOS_GOOGLE_SERVICES_PRODUCTION : "./GoogleService-Info.production.plist",
+      androidGoogleServicesFile: IS_EAS_CI ? process.env.ANDROID_GOOGLE_SERVICES_PRODUCTION : "./google-services.production.json",
+      iosGoogleServicesFile: IS_EAS_CI ? process.env.IOS_GOOGLE_SERVICES_PRODUCTION : "./GoogleService-Info.production.plist",
     },
   };