diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79c4b5f7..6e80b2e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,6 +42,13 @@ ansible-linter:
   image: otthorn/nk20_ci_ansiblelint
   script: ansible-lint ansible/
 
+# Docker linter
+docker-linter:
+  stage: quality-assurance
+  image: hadolint/hadolint
+  script:
+    - hadolint Dockerfile
+
 # Compile documentation
 documentation:
   stage: docs