diff --git a/cxx/dev.Dockerfile b/cxx/dev.Dockerfile
index 882ccef..2466987 100644
--- a/cxx/dev.Dockerfile
+++ b/cxx/dev.Dockerfile
@@ -4,11 +4,11 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
 apt-get install --no-install-recommends -y build-essential ca-certificates curl git libcap2-bin && \
 ln -sf /usr/share/zoneinfo/UTC /etc/localtime
-ENV LANG=C.UTF-8 \
-CHARSET=UTF-8 \
-TZ=UTC \
-CFLAGS="-Os -pipe -flto -fstack-protector-strong --param=ssp-buffer-size=4 -fstack-clash-protection -fpie -fexceptions -fasynchronous-unwind-tables" \
-CPPFLAGS="-D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS" \
-CXXFLAGS=$CFLAGS \
-LDFLAGS="-Wl,-O1,-z,defs,-z,relro,-z,now,-pie,--hash-style=gnu,--no-copy-dt-needed-entries"
+ENV LANG=C.UTF-8
+ENV CHARSET=UTF-8
+ENV TZ=UTC
+ENV CFLAGS="-Os -pipe -flto -fstack-protector-strong --param=ssp-buffer-size=4 -fstack-clash-protection -fpie -fexceptions -fasynchronous-unwind-tables"
+ENV CPPFLAGS="-D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
+ENV CXXFLAGS=$CFLAGS
+ENV LDFLAGS="-Wl,-O1,-z,defs,-z,relro,-z,now,-pie,--hash-style=gnu,--no-copy-dt-needed-entries"
 WORKDIR /build
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 32ac7b3..e5a664d 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -15,13 +15,13 @@ groupadd --gid $PGID app && \
 useradd --uid $PUID --gid $PGID --comment '' --home-dir /dev/shm --no-create-home --shell /bin/bash --no-log-init app && \
 mkdir -p $PREFIX/bin $PREFIX/lib $PREFIX/static $PREFIX/config $PREFIX/data && \
 chown -R $PUID:$PGID $PREFIX
-ENV PATH=$PREFIX/bin:$PATH \
-LD_LIBRARY_PATH=$PREFIX/lib \
-HOME=/dev/shm \
-XDG_RUNTIME_DIR=/dev/shm \
-TMPDIR=/dev/shm \
-LANG=$LANGUAGE.$CHARSET \
-LANGUAGE=$LANGUAGE \
-CHARSET=$CHARSET \
-TZ=$TIMEZONE
+ENV PATH=$PREFIX/bin:$PATH
+ENV LD_LIBRARY_PATH=$PREFIX/lib
+ENV HOME=/dev/shm
+ENV XDG_RUNTIME_DIR=/dev/shm
+ENV TMPDIR=/dev/shm
+ENV LANG=$LANGUAGE.$CHARSET
+ENV LANGUAGE=$LANGUAGE
+ENV CHARSET=$CHARSET
+ENV TZ=$TIMEZONE
 WORKDIR $PREFIX
diff --git a/go/dev.Dockerfile b/go/dev.Dockerfile
index 0bedf7f..dfed991 100644
--- a/go/dev.Dockerfile
+++ b/go/dev.Dockerfile
@@ -5,12 +5,12 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
 apt-get install --no-install-recommends -y build-essential ca-certificates curl git libcap2-bin && \
 ln -sf /usr/share/zoneinfo/UTC /etc/localtime
-ENV LANG=C.UTF-8 \
-CHARSET=UTF-8 \
-TZ=UTC \
-CFLAGS="-Os -pipe -flto -fstack-protector-strong --param=ssp-buffer-size=4 -fstack-clash-protection -fpie -fexceptions -fasynchronous-unwind-tables" \
-CPPFLAGS="-D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS" \
-CXXFLAGS=$CFLAGS \
-LDFLAGS="-Wl,-O1,-z,defs,-z,relro,-z,now,-pie,--hash-style=gnu,--no-copy-dt-needed-entries" \
-CGO_ENABLED=0
+ENV LANG=C.UTF-8
+ENV CHARSET=UTF-8
+ENV TZ=UTC
+ENV CFLAGS="-Os -pipe -flto -fstack-protector-strong --param=ssp-buffer-size=4 -fstack-clash-protection -fpie -fexceptions -fasynchronous-unwind-tables"
+ENV CPPFLAGS="-D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
+ENV CXXFLAGS=$CFLAGS
+ENV LDFLAGS="-Wl,-O1,-z,defs,-z,relro,-z,now,-pie,--hash-style=gnu,--no-copy-dt-needed-entries"
+ENV CGO_ENABLED=0
 WORKDIR /build
diff --git a/node/dev.Dockerfile b/node/dev.Dockerfile
index 1c51952..7bfba70 100644
--- a/node/dev.Dockerfile
+++ b/node/dev.Dockerfile
@@ -1,15 +1,15 @@
-ARG NODE_VERSION=16
+ARG NODE_VERSION=20
 ARG DEBIAN_VERSION=bookworm
 FROM docker.io/library/node:$NODE_VERSION-$DEBIAN_VERSION-slim
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
 apt-get install --no-install-recommends -y build-essential ca-certificates curl git libcap2-bin && \
 ln -sf /usr/share/zoneinfo/UTC /etc/localtime
-ENV LANG=C.UTF-8 \
-CHARSET=UTF-8 \
-TZ=UTC \
-CFLAGS="-Os -pipe -flto -fstack-protector-strong --param=ssp-buffer-size=4 -fstack-clash-protection -fpie -fexceptions -fasynchronous-unwind-tables" \
-CPPFLAGS="-D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS" \
-CXXFLAGS=$CFLAGS \
-LDFLAGS="-Wl,-O1,-z,defs,-z,relro,-z,now,-pie,--hash-style=gnu,--no-copy-dt-needed-entries"
+ENV LANG=C.UTF-8
+ENV CHARSET=UTF-8
+ENV TZ=UTC
+ENV CFLAGS="-Os -pipe -flto -fstack-protector-strong --param=ssp-buffer-size=4 -fstack-clash-protection -fpie -fexceptions -fasynchronous-unwind-tables"
+ENV CXXFLAGS=$CFLAGS
+ENV CPPFLAGS="-D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
+ENV LDFLAGS="-Wl,-O1,-z,defs,-z,relro,-z,now,-pie,--hash-style=gnu,--no-copy-dt-needed-entries"
 WORKDIR /build
diff --git a/python/Dockerfile b/python/Dockerfile
index 6c3d4bf..bde749f 100644
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -17,12 +17,12 @@ useradd --uid $PUID --gid $PGID --comment '' --home-dir /dev/shm --no-create-hom
 mkdir -p $PREFIX/bin $PREFIX/lib $PREFIX/static $PREFIX/config $PREFIX/data && \
 chown -R $PUID:$PGID $PREFIX
 ENV PATH=$PREFIX/bin:$PATH \
-LD_LIBRARY_PATH=$PREFIX/lib \
-HOME=/dev/shm \
-XDG_RUNTIME_DIR=/dev/shm \
-TMPDIR=/dev/shm \
-LANG=$LANGUAGE.$CHARSET \
-LANGUAGE=$LANGUAGE \
-CHARSET=$CHARSET \
-TZ=$TIMEZONE
+ENV LD_LIBRARY_PATH=$PREFIX/lib
+ENV HOME=/dev/shm
+ENV XDG_RUNTIME_DIR=/dev/shm
+ENV TMPDIR=/dev/shm
+ENV LANG=$LANGUAGE.$CHARSET
+ENV LANGUAGE=$LANGUAGE
+ENV CHARSET=$CHARSET
+ENV TZ=$TIMEZONE
 WORKDIR $PREFIX
diff --git a/python/dev.Dockerfile b/python/dev.Dockerfile
index f9aef69..a0e22f3 100644
--- a/python/dev.Dockerfile
+++ b/python/dev.Dockerfile
@@ -5,11 +5,11 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
 apt-get install --no-install-recommends -y build-essential ca-certificates curl git libcap2-bin && \
 ln -sf /usr/share/zoneinfo/UTC /etc/localtime
-ENV LANG=C.UTF-8 \
-CHARSET=UTF-8 \
-TZ=UTC \
-CFLAGS="-Os -pipe -flto -fstack-protector-strong --param=ssp-buffer-size=4 -fstack-clash-protection -fpie -fexceptions -fasynchronous-unwind-tables" \
-CPPFLAGS="-D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS" \
-CXXFLAGS=$CFLAGS \
-LDFLAGS="-Wl,-O1,-z,defs,-z,relro,-z,now,-pie,--hash-style=gnu,--no-copy-dt-needed-entries"
+ENV LANG=C.UTF-8
+ENV CHARSET=UTF-8
+ENV TZ=UTC
+ENV CFLAGS="-Os -pipe -flto -fstack-protector-strong --param=ssp-buffer-size=4 -fstack-clash-protection -fpie -fexceptions -fasynchronous-unwind-tables"
+ENV CPPFLAGS="-D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
+ENV CXXFLAGS=$CFLAGS
+ENV LDFLAGS="-Wl,-O1,-z,defs,-z,relro,-z,now,-pie,--hash-style=gnu,--no-copy-dt-needed-entries"
 WORKDIR /build
diff --git a/stdiscosrv/Dockerfile b/stdiscosrv/Dockerfile
index 3ee4ca4..6c68beb 100644
--- a/stdiscosrv/Dockerfile
+++ b/stdiscosrv/Dockerfile
@@ -5,7 +5,7 @@ RUN strip ./stdiscosrv
 
 FROM ghcr.io/dadevel/debian:latest
 COPY --from=stdiscosrv /build/stdiscosrv ./bin/
-RUN stdiscosrv -version
+RUN stdiscosrv -v
 USER app
 ENTRYPOINT ["stdiscosrv", "-cert=./data/cert.pem", "-key=./data/key.pem", "-db-dir=./data/disco.db"]
 CMD ["-listen=:8443", "-replication-listen=:19200", "-metrics-listen=:19201", "-http"]
diff --git a/syncthing/Dockerfile b/syncthing/Dockerfile
index 7dc9dcf..7cbe86d 100644
--- a/syncthing/Dockerfile
+++ b/syncthing/Dockerfile
@@ -5,9 +5,9 @@ RUN strip ./syncthing
 
 FROM ghcr.io/dadevel/debian:latest
 COPY --from=syncthing /build/syncthing ./bin/
-ENV HOME=/app/home \
-STGUIADDRESS=0.0.0.0:8384 \
-STNODEFAULTFOLDER=true
+ENV HOME=/app/home
+ENV STGUIADDRESS=0.0.0.0:8384
+ENV STNODEFAULTFOLDER=true
 RUN syncthing -version
 USER app
 ENTRYPOINT ["syncthing", "-logfile=-", "-logflags=0", "-home", "./config", "-no-browser", "-no-restart"]
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index e5890f6..3bf1b21 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -15,13 +15,13 @@ groupadd --gid $PGID app && \
 useradd --uid $PUID --gid $PGID --comment '' --home-dir /dev/shm --no-create-home --shell /bin/bash --no-log-init app && \
 mkdir -p $PREFIX/bin $PREFIX/lib $PREFIX/static $PREFIX/config $PREFIX/data && \
 chown -R $PUID:$PGID $PREFIX
-ENV PATH=$PREFIX/bin:$PATH \
-LD_LIBRARY_PATH=$PREFIX/lib \
-HOME=/dev/shm \
-XDG_RUNTIME_DIR=/dev/shm \
-TMPDIR=/dev/shm \
-LANG=$LANGUAGE.$CHARSET \
-LANGUAGE=$LANGUAGE \
-CHARSET=$CHARSET \
-TZ=$TIMEZONE
+ENV PATH=$PREFIX/bin:$PATH
+ENV LD_LIBRARY_PATH=$PREFIX/lib
+ENV HOME=/dev/shm
+ENV XDG_RUNTIME_DIR=/dev/shm
+ENV TMPDIR=/dev/shm
+ENV LANG=$LANGUAGE.$CHARSET
+ENV LANGUAGE=$LANGUAGE
+ENV CHARSET=$CHARSET
+ENV TZ=$TIMEZONE
 WORKDIR $PREFIX