diff --git a/Containerfile.debian b/Containerfile.debian
index 85222fc..6eb9310 100644
--- a/Containerfile.debian
+++ b/Containerfile.debian
@@ -1,5 +1,5 @@
 ARG NODE_VERSION
-FROM docker.io/node:${NODE_VERSION}-buster
+FROM docker.io/node:${NODE_VERSION}-bookworm
 
 RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \
     curl \
@@ -14,13 +14,14 @@ RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \
     make \
     openssl \
     pkg-config \
-    python \
+    python3 \
     tcl \
     vim
+RUN ln -s /usr/bin/python3 /usr/bin/python
 
 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
 
-WORKDIR /project
\ No newline at end of file
+WORKDIR /project
diff --git a/Containerfile.fedora b/Containerfile.fedora
index a886a89..d1074da 100644
--- a/Containerfile.fedora
+++ b/Containerfile.fedora
@@ -1,4 +1,4 @@
-FROM docker.io/fedora:38
+FROM docker.io/fedora:40
 
 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
 
@@ -12,10 +12,11 @@ RUN npm install -g n
 RUN npm install -g yarn
 RUN npm install -g node-gyp
 RUN gem install --no-user-install --no-document fpm
+RUN ln -s /usr/bin/python3 /usr/bin/python
 
 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
 
-WORKDIR /project
\ No newline at end of file
+WORKDIR /project
diff --git a/Makefile b/Makefile
index 472d391..56ead93 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,11 @@ all: web
 
 YARN ?= yarnpkg
 CONTAINER_ENGINE ?= podman
-NODE_VERSION ?= 18
+NODE_VERSION ?= 22
 
 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|')
+#WEB_APP_NAME :=  $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
+WEB_APP_NAME := element
 DESKTOP_APP_NAME :=  $(shell grep '"name"' element-desktop/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
 PRODUCT_NAME :=  $(shell grep '"productName"' element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
 
@@ -186,9 +187,9 @@ container-appimage-release: container-build-debian
 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-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 rpm-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