diff --git a/bitrise.yml b/bitrise.yml
index 070b13b5846..8a001ae1fd0 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -145,8 +145,8 @@ stages:
       - run_tag_smoke_core_android: {}
   build_regression_e2e_ios_android_stage:
     workflows:
-        - ios_e2e_build: {}
-        - android_e2e_build: {}
+      - ios_e2e_build: {}
+      - android_e2e_build: {}
   run_regression_e2e_ios_android_stage:
     workflows:
       - ios_run_regression_tests: {}
@@ -1094,6 +1094,11 @@ workflows:
       bitrise.io:
         stack: linux-docker-android-22.04
         machine_type_id: elite-xl
+  build_android_release_and_upload_sourcemaps:
+    envs:
+      - SENTRY_DISABLE_AUTO_UPLOAD: 'false'
+    after_run:
+      - build_android_release
   build_android_qa:
     before_run:
       - code_setup
@@ -1264,7 +1269,7 @@ workflows:
             - ipa_path: $BITRISE_APP_STORE_IPA_PATH
   build_ios_release:
     envs:
-       - NO_FLIPPER: '1'
+      - NO_FLIPPER: '1'
     before_run:
       - code_setup
     after_run:
@@ -1303,9 +1308,14 @@ workflows:
             - pipeline_intermediate_files: sourcemaps/ios/index.js.map:BITRISE_APP_STORE_SOURCEMAP_PATH
             - deploy_path: sourcemaps/ios/index.js.map
           title: Deploy Source Map
+  build_ios_release_and_upload_sourcemaps:
+    envs:
+      - SENTRY_DISABLE_AUTO_UPLOAD: 'false'
+    after_run:
+      - build_ios_release
   build_ios_qa:
     envs:
-       - NO_FLIPPER: '1'
+      - NO_FLIPPER: '1'
     before_run:
       - code_setup
     after_run:
diff --git a/scripts/build.sh b/scripts/build.sh
index e9993f6d84b..c56b77fdff9 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -300,7 +300,7 @@ buildIosRelease(){
   	remapEnvVariableRelease
 
 	# Enable Sentry to auto upload source maps and debug symbols
-	export SENTRY_DISABLE_AUTO_UPLOAD="false"
+	export SENTRY_DISABLE_AUTO_UPLOAD=${SENTRY_DISABLE_AUTO_UPLOAD:-"true"}
 
 	prebuild_ios
 
@@ -426,7 +426,7 @@ buildAndroidRelease(){
 	fi
 
 	# Enable Sentry to auto upload source maps and debug symbols
-	export SENTRY_DISABLE_AUTO_UPLOAD="false"
+	export SENTRY_DISABLE_AUTO_UPLOAD=${SENTRY_DISABLE_AUTO_UPLOAD:-"true"}
 	prebuild_android
 
 	# GENERATE APK