diff --git a/.github/workflows/upload-build.yml b/.github/workflows/upload-build.yml
index ebe79e9a73..482d9237b5 100644
--- a/.github/workflows/upload-build.yml
+++ b/.github/workflows/upload-build.yml
@@ -17,8 +17,8 @@ jobs:
             pip3 install meson
             brew install ninja
             bundle install
-            git config --global user.name iSH
-            git config --global user.email 74480058+ish-actions@users.noreply.github.com
+            git config user.name github-actions
+            git config user.email github-actions@github.cog
             cd deps/aports
             ./download-repos.py
 
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index d0db8892c8..2d30cc74df 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -62,6 +62,8 @@ lane :upload_build do
         changelog: testflight_changelog,
     )
 
+    # uploading a build takes about 5 hours, so merge master back in if there have been any commits during that
+    git_pull(rebase: false)
     push_to_git_remote
     set_github_release(
         repository_name: "ish-app/ish",