diff --git a/.DS_Store b/.DS_Store
index 481251fa..b2aad722 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.github/workflows/react-native-cicd.yml b/.github/workflows/react-native-cicd.yml
index 70bf997c..8a2d17f5 100644
--- a/.github/workflows/react-native-cicd.yml
+++ b/.github/workflows/react-native-cicd.yml
@@ -258,20 +258,20 @@ jobs:
             ./ResgridUnit-ios-prod.ipa
           retention-days: 7
 
-      - name: 📦 Upload Android build artifacts to Testfairy
+      - name: 📦 Upload Android artifact to Firebase App Distribution
         if: (matrix.platform == 'android')
-        uses: alexfu/testfairy-upload-action@main
+        uses: wzieba/Firebase-Distribution-Github-Action@v1
         with:
-          api-key: ${{ secrets.TESTFAIRY_API_KEY }}
+          appId: ${{secrets.FIREBASE_ANDROID_APP_ID}}
+          serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
+          groups: testers
           file: ./ResgridUnit-prod.apk
-          groups: Resgrid
-          notify: on
-
-      - name: 📦 Upload iOS build artifacts to Testfairy
+      
+      - name: 📦 Upload iOS artifact to Firebase App Distribution
         if: (matrix.platform == 'ios')
-        uses: alexfu/testfairy-upload-action@main
+        uses: wzieba/Firebase-Distribution-Github-Action@v1
         with:
-          api-key: ${{ secrets.TESTFAIRY_API_KEY }}
+          appId: ${{secrets.FIREBASE_IOS_APP_ID}}
+          serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
+          groups: testers
           file: ./ResgridUnit-ios-adhoc.ipa
-          groups: Resgrid
-          notify: on
diff --git a/app.config.ts b/app.config.ts
index 978964de..3fdae79c 100644
--- a/app.config.ts
+++ b/app.config.ts
@@ -35,7 +35,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     versionCode: Env.ANDROID_VERSION_CODE,
     adaptiveIcon: {
       foregroundImage: './assets/adaptive-icon.png',
-      backgroundColor: '#2E3C4B',
+      backgroundColor: '#2a7dd5',
     },
     softwareKeyboardLayoutMode: 'pan',
     package: Env.PACKAGE,
@@ -59,7 +59,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     [
       'expo-splash-screen',
       {
-        backgroundColor: '#2E3C4B',
+        backgroundColor: '#2a7dd5',
         image: './assets/adaptive-icon.png',
         imageWidth: 250,
       },
@@ -77,7 +77,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
       'expo-notifications',
       {
         icon: './assets/notification-icon.png',
-        color: '#2E3C4B',
+        color: '#2a7dd5',
         permissions: {
           ios: {
             allowAlert: true,
@@ -143,9 +143,9 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     [
       'expo-location',
       {
-        locationWhenInUsePermission: 'Allow Resgird Unit to show current location on map.',
-        locationAlwaysAndWhenInUsePermission: 'Allow Resgrid Unit to use your location.',
-        locationAlwaysPermission: 'Resgrid Unit needs to track your location',
+        locationWhenInUsePermission: 'Allow Resgrid Unit to show current location on map.',
+        locationAlwaysAndWhenInUsePermission: 'Allow Resgrid Unit to use your location for department updates.',
+        locationAlwaysPermission: 'Resgrid Unit needs to track your location for department AVL.',
         isIosBackgroundLocationEnabled: true,
         isAndroidBackgroundLocationEnabled: true,
         isAndroidForegroundServiceEnabled: true,
@@ -215,7 +215,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
       {
         isBackgroundEnabled: true,
         modes: ['peripheral', 'central'],
-        bluetoothAlwaysPermission: 'Allow Resgrid Unit to connect to bluetooth devices',
+        bluetoothAlwaysPermission: 'Allow Resgrid Unit to connect to bluetooth devices for PTT.',
       },
     ],
     [