diff --git a/docker/code-analysis/Dockerfile b/docker/code-analysis/Dockerfile
index f73cc270bd8cff6b3e7096bd832a96b091ef2705..17fbe2de7b7f067dbfb28dbf61c259751f890e90 100644
--- a/docker/code-analysis/Dockerfile
+++ b/docker/code-analysis/Dockerfile
@@ -236,12 +236,12 @@ RUN \
     make install
 
 #install cpd
-WORKDIR /home/user
-
 ARG PMD_VERSION=6.19.0
 RUN \
+    cd /opt/dev && \
     wget -nv https://github.com/pmd/pmd/releases/download/pmd_releases%2F${PMD_VERSION}/pmd-bin-${PMD_VERSION}.zip && \
-    unzip pmd-bin-${PMD_VERSION}.zip
+    unzip pmd-bin-${PMD_VERSION}.zip && \
+    mv pmd-bin-${PMD_VERSION} /usr/local/pmd
 
 # microxml
 ARG MICROXML_VERSION=72965423184f24cc0b963d91c2d1863cdb01b6aa
diff --git a/static-code-analysis.yml b/static-code-analysis.yml
index 2f0114fef9534018e7f821356305864c3858079c..4714f78dcdb51fa32bd0b8f1f44b2d6dadb91555 100644
--- a/static-code-analysis.yml
+++ b/static-code-analysis.yml
@@ -1,5 +1,5 @@
 variables:
-  COMMON_IMAGE: "dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis:0.29"
+  COMMON_IMAGE: "dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis:0.30"
   SOURCE_FOLDER: "src"
   SHELL_SRC: ""
   FLAWFINDER_OPTIONS: "-m 4 --error-level=4"