diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/action.yml b/.github/actions/javascript/markPullRequestsAsDeployed/action.yml
index 40dfc05e5448..aadf433fba2f 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/action.yml
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/action.yml
@@ -17,12 +17,18 @@ inputs:
     ANDROID:
         description: "Android job result ('success', 'failure', 'cancelled', or 'skipped')"
         required: true
+    ANDROID_HYBRID:
+        description: "Android job result ('success', 'failure', 'cancelled', or 'skipped')"
+        required: true
     DESKTOP:
         description: "Desktop job result ('success', 'failure', 'cancelled', or 'skipped')"
         required: true
     IOS:
         description: "iOS job result ('success', 'failure', 'cancelled', or 'skipped')"
         required: true
+    IOS_HYBRID:
+        description: "iOS job result ('success', 'failure', 'cancelled', or 'skipped')"
+        required: true
     WEB:
         description: "Web job result ('success', 'failure', 'cancelled', or 'skipped')"
         required: true
diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
index 4738ea85c1ac..fceb8c431321 100644
--- a/.github/workflows/createNewVersion.yml
+++ b/.github/workflows/createNewVersion.yml
@@ -143,7 +143,7 @@ jobs:
           BUILD_NUMBER=$(echo "$NEW_VERSION" | awk -F'-' '{print $2}')
           tools/buildtools/bump-version-automatically.sh "$SHORT_APP_VERSION" "$BUILD_NUMBER"
         env:
-          NEW_VERSION: ${{ steps.createNewVersion.outputs.NEW_VERSION }}
+          NEW_VERSION: ${{ needs.createNewVersion.outputs.NEW_VERSION }}
 
       - name: Commit new version
         run: |
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ffcb50864cf9..f0301edf2a6c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -270,14 +270,6 @@ jobs:
         env:
           BROWSERSTACK: ${{ secrets.BROWSERSTACK }}
 
-# TODO: Fix Sourcemaps
-#      - name: Upload Android sourcemaps artifact
-#        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: android-sourcemaps-artifact
-#          path: ../Android/build/generated/sourcemaps/react/release/index.android.bundle.map
-
       - name: Upload Android build artifact
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         uses: actions/upload-artifact@v4
@@ -505,6 +497,7 @@ jobs:
           ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
 
       - uses: actions/setup-node@v4
+        id: setup-node
         with:
           node-version-file: 'Mobile-Expensify/react-native/.nvmrc'
           cache-dependency-path: 'Mobile-Expensify/react-native'
@@ -581,9 +574,7 @@ jobs:
 
       - name: Build iOS HybridApp
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: | 
-          export SOURCEMAP_FILE="$(pwd)/../main.jsbundle.map";
-          bundle exec fastlane ios build_hybrid
+        run: bundle exec fastlane ios build_hybrid
 
 #      - name: Upload release build to TestFlight
 #        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
@@ -604,14 +595,6 @@ jobs:
         env:
           BROWSERSTACK: ${{ secrets.BROWSERSTACK }}
 
-# TODO: Fix Sourcemaps
-#      - name: Upload iOS sourcemaps artifact
-#        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: ios-sourcemaps-artifact
-#          path: ./main.jsbundle.map
-
       - name: Upload iOS build artifact
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         uses: actions/upload-artifact@v4