diff --git a/configs/sc/config.json b/configs/sc/config.json
index 2916dee..4af6da3 100644
--- a/configs/sc/config.json
+++ b/configs/sc/config.json
@@ -1,6 +1,11 @@
 {
     "update_base_url": null,
-    "default_server_name": "matrix.org",
+    "default_server_config": {
+        "m.homeserver": {
+            "base_url": "https://matrix-client.matrix.org",
+            "server_name": "matrix.org"
+        }
+    },
     "brand": "SchildiChat",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
@@ -14,7 +19,10 @@
     "showLabsSettings": true,
     "roomDirectory": {
         "servers": [
-            "matrix.org"
+            "matrix.org",
+            "gitter.im",
+            "libera.chat",
+            "schildi.chat"
         ]
     },
     "enable_presence_by_hs_url": {
diff --git a/deploy/update-flathub.sh b/deploy/update-flathub.sh
index 31c4ce5..7451aec 100755
--- a/deploy/update-flathub.sh
+++ b/deploy/update-flathub.sh
@@ -20,8 +20,11 @@ debdate=$(date +%Y-%m-%d -r $debpath)
 pushd "$repopath" > /dev/null
 
 git fetch
+git checkout master
 git reset --hard origin/master
 
+git checkout -B "release-v$version"
+
 yamlFile="chat.schildi.desktop.yaml"
 xmlFile="chat.schildi.desktop.metainfo.xml"
 
@@ -33,8 +36,8 @@ sed -i "s|^\s\s<releases>$|  <releases>\n    <release version=\"$version\" date=
 git add $yamlFile $xmlFile
 git commit -m "Bump version to v$version"
 
-git push
+git push -f --set-upstream origin "release-v$version"
 
 popd > /dev/null
 
-echo "Release v$version published on flathub!"
+echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/"
diff --git a/element-desktop b/element-desktop
index cbcbe7f..dd74e36 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit cbcbe7ff684f4200e362d0bc7178281b2c79d89b
+Subproject commit dd74e3628176f0ad39097325e5603fec51408a83
diff --git a/element-web b/element-web
index 8a4c07f..fcf043c 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 8a4c07f24559dc0888413f9fc714d1bb6eecfecb
+Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d
diff --git a/generate_changelog.sh b/generate_changelog.sh
index 3bca794..1e65601 100755
--- a/generate_changelog.sh
+++ b/generate_changelog.sh
@@ -16,8 +16,8 @@ forall_repos check_branch $branch
 forall_repos check_clean_git
 
 # Fetch upstream
-forall_repos git fetch origin > /dev/null
-forall_repos git fetch upstream > /dev/null
+forall_repos git fetch origin > /dev/null 2>/dev/null
+forall_repos git fetch upstream > /dev/null 2>/dev/null
 
 (
     # Add new line below git log: https://unix.stackexchange.com/a/345558
diff --git a/i18n-overlays/element-desktop/ja.json b/i18n-overlays/element-desktop/ja.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/i18n-overlays/element-desktop/ja.json
@@ -0,0 +1 @@
+{}
diff --git a/i18n-overlays/element-web/ja.json b/i18n-overlays/element-web/ja.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/i18n-overlays/element-web/ja.json
@@ -0,0 +1 @@
+{}
diff --git a/i18n-overlays/matrix-react-sdk/ja.json b/i18n-overlays/matrix-react-sdk/ja.json
new file mode 100644
index 0000000..fedc533
--- /dev/null
+++ b/i18n-overlays/matrix-react-sdk/ja.json
@@ -0,0 +1,3 @@
+{
+    "Normal priority": "常優先度"
+}
diff --git a/matrix-js-sdk b/matrix-js-sdk
index cb81a65..6128de1 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit cb81a65097a0bb861da9e7384cb7469ed42e7a58
+Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636
diff --git a/matrix-react-sdk b/matrix-react-sdk
index eb6b8d0..0ad473a 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit eb6b8d0b878102c5fe7420e185667e450f99cf7a
+Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e