diff --git a/Dockerfile b/Dockerfile
index f9b00f6f..12cfba53 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 COPY requirements.txt /code/
 
 # Install all system and Python dependencies in one go
-# hadolint ignore=DL3008, DL3013
+# hadolint ignore=DL3008,DL3013
 RUN apt-get update -y && \
     apt-get install --no-install-recommends -y \
       gcc \
@@ -39,12 +39,12 @@ COPY . /code
 
 # Are we debugging?
 ARG DEBUG=0
-RUN if [ "${DEBUG}" -gt 0 ]; then pip install -e ".[debug]"; else pip install .; fi;
+RUN if [ "${DEBUG}" -gt 0 ]; then pip --no-cache-dir install -e ".[debug]"; else pip install --no-cache-dir .; fi;
 
 # Are we building with locally-checked-out shared modules?
 # hadolint ignore=SC2102
-RUN if test -e modules/reana-commons; then pip install -e modules/reana-commons[kubernetes] --upgrade; fi
-RUN if test -e modules/reana-db; then pip install -e modules/reana-db --upgrade; fi
+RUN if test -e modules/reana-commons; then pip install --no-cache-dir -e modules/reana-commons[kubernetes] --upgrade; fi
+RUN if test -e modules/reana-db; then pip install --no-cache-dir -e modules/reana-db --upgrade; fi
 
 # Check for any broken Python dependencies
 RUN pip check
diff --git a/run-tests.sh b/run-tests.sh
index 327607c0..3d5ceb03 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -90,7 +90,7 @@ check_pytest () {
 }
 
 check_dockerfile () {
-    docker run -i --rm docker.io/hadolint/hadolint:v1.18.2 < Dockerfile
+    docker run -i --rm docker.io/hadolint/hadolint:v2.12.0 < Dockerfile
 }
 
 check_docker_build () {