diff --git a/docker/code-analysis/Dockerfile b/docker/code-analysis/Dockerfile
index 17fbe2de7b7f067dbfb28dbf61c259751f890e90..a7abe20ad852c97012521f9be2ba4970688841f1 100644
--- a/docker/code-analysis/Dockerfile
+++ b/docker/code-analysis/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 LABEL maintainer="suru.dissanaike@iopsys.eu"
 LABEL build="docker build -t code-analysis ."
@@ -81,19 +81,17 @@ RUN \
     cd cppcheck && \
     mkdir build && \
     cd build && \
-    cmake -j$(nproc) -DHAVE_RULES=ON -DUSE_MATCHCOMPILER=ON .. && \
+    cmake -DHAVE_RULES=ON -DUSE_MATCHCOMPILER=ON .. && \
     cmake --build . && \
     cmake --install . && \
     cd ../.. && \
     rm -rf cppcheck
 
 # install node
-ARG NODE_VERSION=16.17.1
-RUN deb_architecture="$(dpkg --print-architecture)" && \
-    curl -fsSL "https://deb.nodesource.com/node_16.x/pool/main/n/nodejs/nodejs_${NODE_VERSION}-deb-1nodesource1_${deb_architecture}.deb" -o /tmp/nodejs.deb && \
-    dpkg -i /tmp/nodejs.deb && \
-    apt-get install -y --fix-broken && \
-    npm install --global typescript yarn
+ARG NODEJS_VERSION_MAJOR=16
+RUN curl -fsSL "https://deb.nodesource.com/setup_${NODEJS_VERSION_MAJOR}.x" | bash - && \
+    apt-get install -y nodejs && \
+    rm -rf /var/lib/apt/lists/*
 
 # install typescript
 ARG TYPESCRIPT_VERSION=4.8.4
@@ -175,7 +173,7 @@ RUN \
     make install
 
 # json-cpp
-ARG JSON_CPP_VERSION=be61ad147000be4802173d0d118fd1b8109b4668
+ARG JSON_CPP_VERSION=v3.11.2
 RUN \
     cd /opt/dev && \
     git clone https://github.com/nlohmann/json.git && \