diff --git a/node/Dockerfile b/node/Dockerfile
index 0bbc90b..a01aa13 100644
--- a/node/Dockerfile
+++ b/node/Dockerfile
@@ -1,5 +1,5 @@
-ARG VERSION="latest"
-FROM registry.tomastm.com/base-debian:${VERSION}
+ARG VERSION="latest-arm64"
+FROM registry.tomastm.com/base-ubuntu:${VERSION}
 
 COPY install-packages.sh /tmp/install-packages.sh
 RUN sudo chmod +x /tmp/install-packages.sh && /tmp/install-packages.sh && sudo rm /tmp/install-packages.sh
diff --git a/node/install-packages.sh b/node/install-packages.sh
index 0303a36..754b20b 100644
--- a/node/install-packages.sh
+++ b/node/install-packages.sh
@@ -24,8 +24,15 @@ corepack enable npm
 corepack enable pnpm
 corepack enable yarn
 
+# Set up PNPM environment for the current script execution
+export PNPM_HOME="$HOME/.local/share/pnpm"
+mkdir -p "$PNPM_HOME"
+export PATH="$PNPM_HOME:$PATH"
+
+# Now install global packages
 pnpm add -g vscode-langservers-extracted typescript-language-server
 
+# Also add to .zshrc for future shell sessions
 cat << 'EOF' >> $HOME/.zshrc
 
 # pnpm