diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 846d01c..9fa6292 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,4 +16,4 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Check Dockerfile compliance
-        run: docker run -i --rm hadolint/hadolint:v1.18.2 < Dockerfile
+        run: docker run -i --rm hadolint/hadolint:v2.12.0 < Dockerfile
diff --git a/Dockerfile b/Dockerfile
index cb8b04b..9696ef9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,10 +6,10 @@ RUN apt update; \
     apt install -y wget gnupg;
 # setup of the fcc apt repository
 # hadolint ignore=DL3027
-RUN wget -q  https://fcc-pileup.web.cern.ch/fcc-pileup/sw/latest/x86_64-ubuntu1804-gcc8-opt/keyFile; \ 
-    apt-key add keyFile; \ 
+RUN wget -q  https://fcc-pileup.web.cern.ch/fcc-pileup/sw/latest/x86_64-ubuntu1804-gcc8-opt/keyFile; \
+    apt-key add keyFile; \
     rm keyFile; \
-    wget https://fcc-pileup.web.cern.ch/fcc-pileup/sw/latest/x86_64-ubuntu1804-gcc8-opt/hep-fccrepoconfig_0.0-3.deb; \
+    wget -q https://fcc-pileup.web.cern.ch/fcc-pileup/sw/latest/x86_64-ubuntu1804-gcc8-opt/hep-fccrepoconfig_0.0-3.deb; \
     dpkg -i hep-fccrepoconfig_0.0-3.deb; \
     rm hep-fccrepoconfig_0.0-3.deb; \
     apt update; \
@@ -30,13 +30,13 @@ ENV G4NEUTRONHPDATA=/usr/local/share/Geant4/data/G4NDL4.5 \
     G4ABLADATA=/usr/local/share/Geant4/data/G4ABLA3.1 \
     G4ENSDFSTATEDATA=/usr/local/share/Geant4/data/G4ENSDFSTATE2.2 \
     PYTHIA8_DIR=/usr/local \
-    PYTHIA8_XML=$PYTHIA8_DIR/share/Pythia8/xmldoc \
-    PYTHIA8DATA=$PYTHIA8_XML \
-    HEPMC_PREFIX=$PYTHIA8_DIR \
+    PYTHIA8_XML=/usr/local/share/Pythia8/xmldoc \
+    PYTHIA8DATA=/usr/local/share/Pythia8/xmldoc \
+    HEPMC_PREFIX=/usr/local \
     DD4hepINSTALL=/usr/local/ \
     DD4hep_DIR=/usr/local/ \
     DD4hep_ROOT=/usr/local/ \
-    DD4HEP_LIBRARY_PATH=$/usr/local/lib/ \
+    DD4HEP_LIBRARY_PATH=/usr/local/lib/ \
     ROOT_INCLUDE_PATH=$ROOT_INCLUDE_PATH:/usr/local/include:/usr/local/include/datamodel \
     PYTHONPATH=$PYTHONPATH:/usr/local/lib:/usr/local/python:/usr/local/lib/root:/opt/madgraph \
     PATH=$PATH:/usr/local/scripts/:/usr/local/bin \