diff --git a/Containerfile.debian b/Containerfile.debian
index 85222fc..041c64e 100644
--- a/Containerfile.debian
+++ b/Containerfile.debian
@@ -1,5 +1,5 @@
 ARG NODE_VERSION
-FROM docker.io/node:${NODE_VERSION}-buster
+FROM node:${NODE_VERSION}
 
 RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \
     curl \
@@ -23,4 +23,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     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
 
-WORKDIR /project
\ No newline at end of file
+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
index a886a89..a61578c 100644
--- a/Containerfile.fedora
+++ b/Containerfile.fedora
@@ -1,6 +1,6 @@
-FROM docker.io/fedora:38
+FROM fedora:latest
 
-RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat pkgconf perl
+RUN dnf install -y openssl openssl-devel rust cargo llvm libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
 
 # node setup
 ARG NODE_VERSION
@@ -13,9 +13,8 @@ RUN npm install -g yarn
 RUN npm install -g node-gyp
 RUN gem install --no-user-install --no-document fpm
 
-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
 
-WORKDIR /project
\ No newline at end of file
+# There might be remnants of the host which break the build
+RUN make fixup
diff --git a/Containerfile.windows b/Containerfile.windows
deleted file mode 100644
index 0c0776a..0000000
--- a/Containerfile.windows
+++ /dev/null
@@ -1,13 +0,0 @@
-ARG CONTAINER_IMAGE_DEBIAN
-FROM ${CONTAINER_IMAGE_DEBIAN}:latest
-
-RUN dpkg --add-architecture i386 && apt-get update && apt-get install --no-install-recommends -y \
-    wine \
-    wine32 \
-    wine64 \
-    libwine \
-    libwine:i386 \
-    fonts-wine \
-    zip
-
-WORKDIR /project
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 472d391..205cea9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 .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 container-build-windows
-.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release container-windows-release container-release container-local-pkgbuild
+.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
 .PHONY: fix_yarn_cache
 
@@ -12,7 +12,7 @@ all: web
 
 YARN ?= yarnpkg
 CONTAINER_ENGINE ?= podman
-NODE_VERSION ?= 18
+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|')
@@ -39,7 +39,6 @@ OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app
 
 CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian
 CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora
-CONTAINER_IMAGE_WINDOWS := schildichat-desktop-containerbuild-windows
 
 RELEASE_DIR := release
 CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
@@ -77,7 +76,7 @@ web: setup
 
 desktop-common: web
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
-	SQLCIPHER_BUNDLED=1 $(YARN) --cwd element-desktop run build:native
+	SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native
 
 macos-common: web icns
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
@@ -163,35 +162,22 @@ macos-mas-release: macos-mas
 	cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)
 
 container-build-debian:
-	$(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) .
+	$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) .
 
 container-build-fedora:
-	$(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) .
-
-container-build-windows: container-build-debian
-	$(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_WINDOWS) -f Containerfile.windows --build-arg CONTAINER_IMAGE_DEBIAN=$(CONTAINER_IMAGE_DEBIAN) .
+	$(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):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release
+	$(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):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release
+	$(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):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release
+	$(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):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release
-
-container-windows-release: container-build-windows
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make windows-release
-
-container-release: container-build-windows container-build-fedora 
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make web-release debian-release appimage-release windows-setup-release windows-portable-release
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release
-
-container-local-pkgbuild: container-build-debian
-	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make local-pkgbuild
+	$(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
diff --git a/element-desktop b/element-desktop
index fb2931e..c221f6c 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit fb2931eb808d99995a4cd5ef168e8d4697f39e3f
+Subproject commit c221f6cf768fbc133c744d4869744d8c12c75e64
diff --git a/element-web b/element-web
index 904c637..bfa6512 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 904c6378682d314fe91bf536b6207c6d5e320459
+Subproject commit bfa65127b2f7a68cdb4086a68250bbdade6e3d06
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 9bbc329..255144e 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 9bbc329635e1e31f5e72e93ef87ccd90b43de538
+Subproject commit 255144ef2c9e141a171101e18091961f1be6db7f
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 5a1c347..9994f86 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 5a1c34750acf0c8da2a8ba25b6f79e9ac115230e
+Subproject commit 9994f867123a10b78fae014c3fa1ef919d89487e