diff --git a/.containerignore b/.containerignore
deleted file mode 100644
index ae02570..0000000
--- a/.containerignore
+++ /dev/null
@@ -1 +0,0 @@
-release/
\ No newline at end of file
diff --git a/Containerfile.debian b/Containerfile.debian
deleted file mode 100644
index 041c64e..0000000
--- a/Containerfile.debian
+++ /dev/null
@@ -1,30 +0,0 @@
-ARG NODE_VERSION
-FROM node:${NODE_VERSION}
-
-RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \
-    curl \
-    g++ \
-    gcc \
-    git \
-    jq \
-    libarchive-tools \
-    libsecret-1-dev \
-    libsqlcipher-dev \
-    libssl-dev \
-    make \
-    openssl \
-    pkg-config \
-    python \
-    tcl \
-    vim
-
-ENV RUSTUP_HOME=/usr/local/rustup \
-    CARGO_HOME=/usr/local/cargo \
-    PATH=/usr/local/cargo/bin:$PATH
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal
-
-COPY . /project
-WORKDIR /project
-
-# There might be remnants of the host which break the build
-RUN make fixup
\ No newline at end of file
diff --git a/Containerfile.fedora b/Containerfile.fedora
deleted file mode 100644
index 279d43f..0000000
--- a/Containerfile.fedora
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM fedora:latest
-
-RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
-
-# node setup
-ARG NODE_VERSION
-RUN mkdir -p /usr/local/n
-RUN mkdir -p /usr/local/bin /usr/local/lib /usr/local/include /usr/local/share
-RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
-RUN bash n ${NODE_VERSION}
-RUN npm install -g n
-RUN npm install -g yarn
-RUN npm install -g node-gyp
-RUN gem install --ignore-dependencies --no-user-install --no-document fpm
-
-COPY . /project
-WORKDIR /project
-
-# There might be remnants of the host which break the build
-RUN make fixup
\ No newline at end of file
diff --git a/Makefile b/Makefile
index c517e5b..21c3bf4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
 .PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
 .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
 .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
-.PHONY: container-build-debian container-build-fedora
-.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release
 .PHONY: clean undo_setup fixup
 
 CFGDIR ?= configs/sc
@@ -10,8 +8,6 @@ CFGDIR ?= configs/sc
 all: web
 
 YARN ?= yarnpkg
-CONTAINER_ENGINE ?= podman
-NODE_VERSION ?= 16
 
 VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
 WEB_APP_NAME :=  $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
@@ -36,9 +32,6 @@ OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
 OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg
 OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app
 
-CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian
-CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora
-
 RELEASE_DIR := release
 CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
 
@@ -160,24 +153,6 @@ macos-mas-release: macos-mas
 	mkdir -p $(CURRENT_RELEASE_DIR)
 	cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)
 
-container-build-debian:
-	$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) .
-
-container-build-fedora:
-	$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) .
-
-container-web-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release
-
-container-debian-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release
-
-container-rpm-release: container-build-fedora
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release
-
-container-appimage-release: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release
-
 bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
 	./build-bom.sh
 bom: bom.lock
diff --git a/configs/sc/config.json b/configs/sc/config.json
index 4af6da3..2916dee 100644
--- a/configs/sc/config.json
+++ b/configs/sc/config.json
@@ -1,11 +1,6 @@
 {
     "update_base_url": null,
-    "default_server_config": {
-        "m.homeserver": {
-            "base_url": "https://matrix-client.matrix.org",
-            "server_name": "matrix.org"
-        }
-    },
+    "default_server_name": "matrix.org",
     "brand": "SchildiChat",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
@@ -19,10 +14,7 @@
     "showLabsSettings": true,
     "roomDirectory": {
         "servers": [
-            "matrix.org",
-            "gitter.im",
-            "libera.chat",
-            "schildi.chat"
+            "matrix.org"
         ]
     },
     "enable_presence_by_hs_url": {
diff --git a/element-desktop b/element-desktop
index d25e426..07d1283 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit d25e426c42d4eeef4fd62aea61642fd66fe7f73b
+Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00
diff --git a/element-web b/element-web
index ebb0d6a..d7e4930 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit ebb0d6a212299540247587abd345ce633a414813
+Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 6128de1..1474204 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636
+Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 23de404..c9fb6bb 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 23de404c637747b5f2662b12355b0cbc4ab0d951
+Subproject commit c9fb6bbbb8bf97802277127601163618669acdee