diff --git a/resources/build/build-utils.sh b/resources/build/build-utils.sh
index aca68ee6ce..fc9e433817 100755
--- a/resources/build/build-utils.sh
+++ b/resources/build/build-utils.sh
@@ -198,6 +198,8 @@ function exportEnvironmentDefinitionScript() {
 
     echo "# Required for successful dSYM upload for Sentry error reporting" >> "$ENVIRONMENT_SH"
     echo "export SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN:-}" >> "$ENVIRONMENT_SH"
+    echo "export SENTRY_URL=${SENTRY_URL:-}" >> "$ENVIRONMENT_SH"
+    echo "export SENTRY_ORG=${SENTRY_ORG:-}" >> "$ENVIRONMENT_SH"
 
     # Ensure the autogenerated file may be successfully run/included by xcode-utils.sh.
     chmod +x "$ENVIRONMENT_SH"
diff --git a/resources/build/xcode-utils.sh b/resources/build/xcode-utils.sh
index 08335f6304..a360d07fa8 100755
--- a/resources/build/xcode-utils.sh
+++ b/resources/build/xcode-utils.sh
@@ -129,8 +129,6 @@ function phaseSentryDsymUpload() {
 
   # The remaining update logic seen here was auto-generated at https://sentry.keyman.com/keyman/keyman-ios/getting-started/cocoa-swift/
   if which sentry-cli >/dev/null; then
-    export SENTRY_URL="https://sentry.keyman.com"
-    export SENTRY_ORG=keyman
     export SENTRY_PROJECT="$SENTRY_PROJECT_TARGET"
     export SENTRY_LOG_LEVEL=info
     ERROR=$(sentry-cli upload-dif "$DWARF_DSYM_FOLDER_PATH" 2>&1 >/dev/null)