diff --git a/Makefile b/Makefile
index c1aa84ece..c0b0d6b3a 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,12 @@ endif
 all: init
 	$(TERRAFORM) apply $(TF_VARS)
 
+fmt:
+	$(TERRAFORM) fmt -check -recursive .
+
+validate:
+	$(TERRAFORM) validate
+
 image/%: init
 	$(TERRAFORM) apply $(TF_VARS) -target=module.$*