diff --git a/Makefile b/Makefile
index f84e0e1c..90a60321 100644
--- a/Makefile
+++ b/Makefile
@@ -24,3 +24,7 @@ docs:
 
 .PHONY: apply
 apply: metal infra apps
+
+lint:
+	make -C metal lint
+	make -C infra lint
diff --git a/infra/Makefile b/infra/Makefile
index 835a4cbb..55897cc1 100644
--- a/infra/Makefile
+++ b/infra/Makefile
@@ -16,3 +16,6 @@ apply: plan
 
 destroy:
 	terraform destroy
+
+lint:
+	terraform fmt -recursive -diff -check
diff --git a/metal/Makefile b/metal/Makefile
index 712dd561..d415b09d 100644
--- a/metal/Makefile
+++ b/metal/Makefile
@@ -11,3 +11,6 @@ shutdown:
 	ansible-playbook \
 		--inventory hosts.yml \
 		shutdown.yml
+
+lint:
+	ansible-lint --project-dir .
diff --git a/tools/Dockerfile b/tools/Dockerfile
index 19613e58..5ef5207c 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -5,6 +5,8 @@ COPY ./mirrorlist /etc/pacman.d/mirrorlist
 
 RUN yes | pacman --sync --refresh \
         ansible \
+        ansible-lint \
+        diffutils \
         docker \
         docker-compose \
         git \