diff --git a/container-builder/ubuntu-fatboy.Dockerfile b/container-builder/ubuntu-fatboy.Dockerfile
index b4fc5a9..bb9efce 100644
--- a/container-builder/ubuntu-fatboy.Dockerfile
+++ b/container-builder/ubuntu-fatboy.Dockerfile
@@ -44,7 +44,7 @@ RUN python3 -m venv /usr/local/pyenv \
     && /usr/local/pyenv/bin/pip install --upgrade pip \
     && /usr/local/pyenv/bin/pip install pyyaml
 # Make virtualenv the default Python
-#ENV PATH="/usr/local/pyenv/bin:${PATH}"
+ENV PATH="/usr/local/pyenv/bin:${PATH}"
 
 # --- Install yq ---
 RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 \
diff --git a/devops/Dockerfile b/devops/Dockerfile
index cad47bb..3e5f84c 100644
--- a/devops/Dockerfile
+++ b/devops/Dockerfile
@@ -48,10 +48,12 @@ RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | b
 RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 \
     -O /usr/bin/yq && chmod +x /usr/bin/yq
 
-# --- Install Node.js (LTS) ---
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
-    && apt-get install -y nodejs \
-    && npm install -g npm@latest
+
+# Install Node.js 22.x
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
+    && apt-get install -y --no-install-recommends nodejs \
+    && npm cache clean --force
+
 
 # --- Install act (GitHub Actions local runner) ---
 RUN mkdir /tmp/act \