diff --git a/element-desktop b/element-desktop
index 57f3328..093d2e2 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 57f3328e37d3f6b1a1f76df82017358236170b70
+Subproject commit 093d2e28d82e693b8f7575b1b16206723b9269e5
diff --git a/element-web b/element-web
index b85184e..9fa6db0 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit b85184e7579e6d3503bd44f6d283d463eef0558e
+Subproject commit 9fa6db056ac4cd2240a9b676cf305a1ca73bc15c
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 3e11b1c..b6a86ca 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 3e11b1c51c4b0f0e673c4b22864f97be7098b888
+Subproject commit b6a86ca2e65407999a71d92cbbfec7a856d7a586
diff --git a/matrix-react-sdk b/matrix-react-sdk
index c6a550e..abfce03 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit c6a550e2c3f9020730c8bd603514e9ce7cf69064
+Subproject commit abfce03f8cd209ce9289cdcd6a0f4c91e0da6072
diff --git a/merge_upstream.sh b/merge_upstream.sh
index e1fd1f2..2e7d31e 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -34,16 +34,19 @@ if [ -z "$1" ]; then
 else
     latest_upstream_tag="$1"
 fi
-forelement_repos git checkout "$latest_upstream_tag"
+
+sc_branch_name="sc_$latest_upstream_tag"
+
+forelement_repos git checkout "$latest_upstream_tag" -B "$sc_branch_name"
 
 get_current_mxsdk_tags
 
 pushd "matrix-js-sdk" > /dev/null
-git checkout "$current_mxjssdk_tag"
+git checkout "$current_mxjssdk_tag" -B "$sc_branch_name"
 popd > /dev/null
 
 pushd "matrix-react-sdk" > /dev/null
-git checkout "$current_mxreactsdk_tag"
+git checkout "$current_mxreactsdk_tag" -B "$sc_branch_name"
 popd > /dev/null
 
 # Refresh environment