diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 796a3828afd9bfc1a69c91e894da1119f5f21ee4..76826c317936b84d1e5ec21d73664e926d0dc145 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,3 +2,12 @@ shellcheck:
   image: koalaman/shellcheck-alpine
   script: 'shellcheck deploy/base/ros_entrypoint.bash scripts/*sh'
   allow_failure: yes
+
+dockerfiles:
+  image: hadolint/hadolint:latest-debian
+  script:
+    - RET=0
+    - hadolint deploy/base/Dockerfile || RET=1
+    - hadolint deploy/dev/Dockerfile || RET=1
+    - exit $RET
+  allow_failure: yes