diff --git a/.devcontainer/DOCKERFILE b/.devcontainer/DOCKERFILE
index fb4f640..be508e6 100644
--- a/.devcontainer/DOCKERFILE
+++ b/.devcontainer/DOCKERFILE
@@ -1,16 +1,17 @@
 # syntax=docker/dockerfile:1
 
-ARG VARIANT="18"
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
+ARG VARIANT="22"
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:1-${VARIANT}-bookworm
 
 # Install cf CLI
-
 USER node
 RUN wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add -
 RUN echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
 RUN sudo apt-get update
-RUN sudo apt-get install cf8-cli
+RUN sudo apt-get install -y cf8-cli
 
-# Install hana-cli gloablly
+# Install hana-cli globally
+# HOME must be set explicitly — hana-cli's postinstall script reads it
 USER node
-RUN npm install -g hana-cli
\ No newline at end of file
+ENV HOME=/home/node
+RUN npm install -g hana-cli
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 69a42d0..7e2ef0c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "VARIANT": "20"
+            "VARIANT": "22"
         }
     },
     "customizations": {
@@ -29,4 +29,4 @@
         5005
     ],
     "remoteUser": "node"
-}
\ No newline at end of file
+}