diff --git a/.github/workflows/build_and_push.yml b/.github/workflows/build_and_push.yml
index 80565493..b88c72e8 100644
--- a/.github/workflows/build_and_push.yml
+++ b/.github/workflows/build_and_push.yml
@@ -72,7 +72,7 @@ jobs:
           TAGS="freikin/dawarich:${VERSION}"
 
           # Set platforms based on version type and release type
-          PLATFORMS="linux/amd64,linux/arm64,linux/arm/v8,linux/arm/v7
+          PLATFORMS="linux/amd64,linux/arm64,linux/arm/v8,linux/arm/v7"
 
           # Check if this is a patch version (x.y.z where z > 0)
           if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[1-9][0-9]*$ ]]; then
@@ -80,7 +80,7 @@ jobs:
             PLATFORMS="linux/amd64"
           elif [[ $VERSION =~ ^[0-9]+\.[0-9]+\.0$ ]]; then
             echo "Detected minor version ($VERSION) - building for all platforms"
-            PLATFORMS="linux/amd64,linux/arm64,linux/arm/v8,linux/arm/v7
+            PLATFORMS="linux/amd64,linux/arm64,linux/arm/v8,linux/arm/v7"
           else
             echo "Version format not recognized or non-semver - using AMD64 only for safety"
             PLATFORMS="linux/amd64"
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index ee6edf40..ca4df914 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -28,12 +28,24 @@ RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no
     less \
     libjemalloc2 libjemalloc-dev \
     cmake \
-    && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
-    && apt-get install -y nodejs \
-    && npm install -g yarn \
+    ca-certificates \
     && mkdir -p $APP_PATH \
     && rm -rf /var/lib/apt/lists/*
 
+# Install Node.js using official NodeSource script
+# NodeSource supports: amd64, arm64, armhf (arm/v7)
+# For unsupported architectures, fall back to Debian's nodejs package
+RUN ARCH=$(dpkg --print-architecture) && \
+    if [ "$ARCH" = "amd64" ] || [ "$ARCH" = "arm64" ] || [ "$ARCH" = "armhf" ]; then \
+        curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+        apt-get install -y nodejs; \
+    else \
+        apt-get update && \
+        apt-get install -y nodejs npm; \
+    fi && \
+    npm install -g yarn && \
+    rm -rf /var/lib/apt/lists/*
+
 # Use jemalloc with check for architecture
 RUN if [ "$(uname -m)" = "x86_64" ]; then \
     echo "/usr/lib/x86_64-linux-gnu/libjemalloc.so.2" > /etc/ld.so.preload; \