diff --git a/codemagic.yaml b/codemagic.yaml
index 4f018d36..db5f982e 100644
--- a/codemagic.yaml
+++ b/codemagic.yaml
@@ -1,6 +1,6 @@
 # Reusable script for building the Flutter app
-build-script: &build-script
-  name: Build Flutter App
+build-script: &flutter-build-script
+  name: 👷 Build Flutter App
   script: |
     flutter pub get
     flutter pub run build_runner build --delete-conflicting-outputs
@@ -9,11 +9,23 @@ build-script: &build-script
     flutter build appbundle --flavor $FLAVOR
 
     # Build iOS
-    flutter build ipa --flavor $FLAVOR --export-options-plist=$FCI_WORKING_DIRECTORY/ios/exportOptions.plist
-    
+    flutter build ipa --flavor $FLAVOR
+
+android-app-build-script: &android-build-script
+  name: 🤖 Build Android App
+  script: |
+    # Build Android
+    flutter build appbundle --flavor $FLAVOR
+
+ios-app-build-script: &android-build-script
+  name: 🍎 Build iOS App
+  script: |
+    # Build Android
+    flutter build ipa --flavor $FLAVOR
+
 # Reusable script for distributing to Firebase
 distribute-script: &distribute-script
-  name: Distribute to Firebase App Distribution
+  name: 🚛 Distribute to Firebase App Distribution
   script: |
     # Distribute Android
     firebase appdistribution:distribute "build/app/outputs/bundle/${FLAVOR}Release/app-${FLAVOR}-release.aab" \
@@ -102,32 +114,38 @@ workflows:
   # =================================================================================
   # Staff App Workflows
   # =================================================================================
-  staff-app-dev:
+  staff-app-dev-app-distribute:
     <<: *staff-app-base
-    name: Staff App Dev
+    name: 🚛👨‍🍳 Staff App Dev (App Distribute)
     environment:
       groups:
         - staff_app_dev_credentials # Codemagic Environment Variable Group
     scripts:
       - *build-script
+      - *build-android-script
+      - *build-ios-script
       - *distribute-script
 
-  staff-app-staging:
+  staff-app-staging-app-distribute:
     <<: *staff-app-base
-    name: Staff App Staging
+    name: 🚛👨‍🍳 Staff App Staging (App Distribute)
     environment:
       groups:
         - staff_app_staging_credentials # Codemagic Environment Variable Group
     scripts:
       - *build-script
+      - *build-android-script
+      - *build-ios-script
       - *distribute-script
 
-  staff-app-prod:
+  staff-app-prod-app-distribute:
     <<: *staff-app-base
-    name: Staff App Prod
+    name: 🚛👨‍🍳 Staff App Prod (App Distribute)
     environment:
       groups:
         - staff_app_prod_credentials # Codemagic Environment Variable Group
     scripts:
       - *build-script
+      - *build-android-script
+      - *build-ios-script
       - *distribute-script