diff --git a/CHANGELOG.md b/CHANGELOG.md
index effe4b5c..87bef5b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - When cloning a repo with Configure, that repo's embedded-git-config file will overwrite previous settings (#819)
 - Settings page no longer removes remote when saving after cloning (#858)
+- Always set the remote as the upstream branch when pushing (#871)
 - Fixed import of HL7 and LUT files added at the same time as their mappings (#864)
 
 ## [2.13.1] - 2025-09-16
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
index 869232e0..605a977b 100644
--- a/cls/SourceControl/Git/Utils.cls
+++ b/cls/SourceControl/Git/Utils.cls
@@ -616,6 +616,7 @@ ClassMethod Push(remote As %String = "origin", force As %Boolean = 0) As %Status
     if (force) {
         set args($i(args)) = "--force"
     }
+    set args($i(args)) = "--set-upstream"
     set args($i(args)) = remote
     set args($i(args)) = branchName
     do ..RunGitWithArgs(.errStream, .outStream, "push", args...)