diff --git a/.github/composite_actions/run_xcodebuild/action.yml b/.github/composite_actions/run_xcodebuild/action.yml
index 52df8fca83..d5567939bf 100644
--- a/.github/composite_actions/run_xcodebuild/action.yml
+++ b/.github/composite_actions/run_xcodebuild/action.yml
@@ -31,10 +31,6 @@ inputs:
     required: false
     type: boolean
     default: false
-  build_for_testing:
-    type: boolean
-    required: false
-    default: false
   other_flags:
     required: false
     type: string
@@ -74,12 +70,6 @@ runs:
           otherFlags+=" -clonedSourcePackagesDirPath $CLONED_SOURCE_PACKAGES_PATH"
         fi
 
-        action="build"
-        if [ "${{ inputs.build_for_testing }}" == "true" ]; then
-          echo "Building for testing..."
-          action+="-for-testing"
-        fi
-
         xcodebuild -version
-        xcodebuild $action -scheme $SCHEME -sdk '${{ inputs.sdk }}' -destination '${{ inputs.destination }}' $otherFlags | xcpretty --simple --color --report junit && exit ${PIPESTATUS[0]}
+        xcodebuild build -scheme $SCHEME -sdk '${{ inputs.sdk }}' -destination '${{ inputs.destination }}' $otherFlags | xcpretty --simple --color --report junit && exit ${PIPESTATUS[0]}
       shell: bash
\ No newline at end of file
diff --git a/.github/workflows/build_amplify_swift.yml b/.github/workflows/build_amplify_swift.yml
index 573b4cc4fe..f22d7097fe 100644
--- a/.github/workflows/build_amplify_swift.yml
+++ b/.github/workflows/build_amplify_swift.yml
@@ -67,16 +67,16 @@ jobs:
           path: ~/Library/Developer/Xcode/DerivedData/Amplify
           key: ${{ steps.dependencies-cache.outputs.cache-primary-key }}
     
-      - name: Delete the old build cache on main
-        if: steps.build-cache.outputs.cache-hit # && github.ref_name == 'main'
+      - name: Delete the old build cache
+        if: steps.build-cache.outputs.cache-hit && github.ref_name == 'main'
         env:
           GH_TOKEN: ${{ github.token }}
         continue-on-error: true
         run: |
           gh cache delete ${{ steps.build-cache.outputs.cache-primary-key }}
 
-      - name: Save the build cache in the main
-        #if: github.ref_name == 'main'
+      - name: Save the build cache
+        if: github.ref_name == 'main'
         uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
           path: ${{ github.workspace }}/Build
diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml
index b928704eb7..518f74b1a4 100644
--- a/.github/workflows/run_unit_tests.yml
+++ b/.github/workflows/run_unit_tests.yml
@@ -30,7 +30,6 @@ on:
 
 permissions:
     contents: read
-    actions: write
 
 jobs:
   unit-tests:
diff --git a/.github/workflows/run_unit_tests_platforms.yml b/.github/workflows/run_unit_tests_platforms.yml
index 2d092bab06..df1f5ed05b 100644
--- a/.github/workflows/run_unit_tests_platforms.yml
+++ b/.github/workflows/run_unit_tests_platforms.yml
@@ -16,19 +16,6 @@ on:
         required: false
         type: boolean
         default: false
-      retry_on_error:
-        description: 'Whether to automatically retry if the tests fail'
-        required: false
-        type: boolean
-        default: true
-      other_flags:
-        required: false
-        type: string
-        default: ''
-
-env:
-  SCHEME: ${{ inputs.scheme }}
-  RETRY_ON_ERROR: ${{ inputs.retry_on_error }}
 
 permissions:
     contents: read
@@ -51,4 +38,5 @@ jobs:
       scheme: ${{ inputs.scheme }}
       platform: ${{ matrix.platform }}
       xcode_version: '14.3'
-      generate_coverage_report: ${{ matrix.platform == 'iOS' && inputs.generate_coverage_report }}
\ No newline at end of file
+      generate_coverage_report: ${{ github.event_name != 'workflow_dispatch' && matrix.platform == 'iOS' && inputs.generate_coverage_report }}
+      timeout-minutes: ${{ inputs.timeout-minutes }}
\ No newline at end of file
diff --git a/.github/workflows/unit_test_amplify.yml b/.github/workflows/unit_test_amplify.yml
index ee804ba5d6..fd6189cdd8 100644
--- a/.github/workflows/unit_test_amplify.yml
+++ b/.github/workflows/unit_test_amplify.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | Amplify
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read
diff --git a/.github/workflows/unit_test_analytics.yml b/.github/workflows/unit_test_analytics.yml
index 6e9dd34447..94108b08c4 100644
--- a/.github/workflows/unit_test_analytics.yml
+++ b/.github/workflows/unit_test_analytics.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | Analytics
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read
diff --git a/.github/workflows/unit_test_api.yml b/.github/workflows/unit_test_api.yml
index e6f80a82ca..75a135c36c 100644
--- a/.github/workflows/unit_test_api.yml
+++ b/.github/workflows/unit_test_api.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | API
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read
diff --git a/.github/workflows/unit_test_auth.yml b/.github/workflows/unit_test_auth.yml
index 64e216a7bb..f1c6e982b8 100644
--- a/.github/workflows/unit_test_auth.yml
+++ b/.github/workflows/unit_test_auth.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | Auth
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read
diff --git a/.github/workflows/unit_test_core.yml b/.github/workflows/unit_test_core.yml
index 2d47f069d8..252c28b5e0 100644
--- a/.github/workflows/unit_test_core.yml
+++ b/.github/workflows/unit_test_core.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | Core
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read
diff --git a/.github/workflows/unit_test_datastore.yml b/.github/workflows/unit_test_datastore.yml
index 1c7fcf1edb..43e31f643c 100644
--- a/.github/workflows/unit_test_datastore.yml
+++ b/.github/workflows/unit_test_datastore.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | DataStore
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read
diff --git a/.github/workflows/unit_test_geo.yml b/.github/workflows/unit_test_geo.yml
index 89acd2f32c..137deacd3d 100644
--- a/.github/workflows/unit_test_geo.yml
+++ b/.github/workflows/unit_test_geo.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | Geo
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read
diff --git a/.github/workflows/unit_test_internal_pinpoint.yml b/.github/workflows/unit_test_internal_pinpoint.yml
index c521d61722..33aff6b2aa 100644
--- a/.github/workflows/unit_test_internal_pinpoint.yml
+++ b/.github/workflows/unit_test_internal_pinpoint.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | Internal Pinpoint
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read
diff --git a/.github/workflows/unit_test_logging.yml b/.github/workflows/unit_test_logging.yml
index f395d62063..8da0b1fd8d 100644
--- a/.github/workflows/unit_test_logging.yml
+++ b/.github/workflows/unit_test_logging.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | Logging
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read
diff --git a/.github/workflows/unit_test_predictions.yml b/.github/workflows/unit_test_predictions.yml
index 0315e0960b..3d382e65a3 100644
--- a/.github/workflows/unit_test_predictions.yml
+++ b/.github/workflows/unit_test_predictions.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | Predictions
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read
diff --git a/.github/workflows/unit_test_push_notifications.yml b/.github/workflows/unit_test_push_notifications.yml
index 4f0991ccdd..c78bf7f88a 100644
--- a/.github/workflows/unit_test_push_notifications.yml
+++ b/.github/workflows/unit_test_push_notifications.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | Push Notifications
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read
diff --git a/.github/workflows/unit_test_storage.yml b/.github/workflows/unit_test_storage.yml
index dbdba90154..21ce464d6e 100644
--- a/.github/workflows/unit_test_storage.yml
+++ b/.github/workflows/unit_test_storage.yml
@@ -1,6 +1,27 @@
 name: Unit Tests | Storage
 on:
   workflow_dispatch:
+    inputs:
+      ios:
+        description: '📱 iOS'
+        required: true
+        default: true
+        type: boolean
+      macos:
+        description: '💻 macOS'
+        required: true
+        default: true
+        type: boolean
+      tvos:
+        description: '📺 tvOS'
+        required: true
+        default: true
+        type: boolean
+      watchos:
+        description: '⌚️ watchOS'
+        required: true
+        default: true
+        type: boolean
 
 permissions:
     contents: read