diff --git a/.hadolint.yaml b/.hadolint.yaml
new file mode 100644
index 00000000..b91b263f
--- /dev/null
+++ b/.hadolint.yaml
@@ -0,0 +1,3 @@
+ignored:
+  - DL3008 # Pin versions in apt-get install
+  - DL3018 # Pin versions in apk add
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a8984bb6..d9401e63 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -47,6 +47,15 @@ repos:
       - id: shellcheck
         files: \.sh$
 
+  # Dockerfile linting with hadolint
+  - repo: https://github.com/hadolint/hadolint
+    rev: v2.14.0
+    hooks:
+      - id: hadolint-docker
+        types: [file]
+        files: (^|/)(Dockerfile|.*\.Dockerfile)$
+        args: [--config, .hadolint.yaml]
+
 # Configuration
 default_stages: [pre-commit]
 fail_fast: false