diff --git a/scripts/terraform_pre_commit.sh b/scripts/terraform_pre_commit.sh
index ccb180182..43e1059ef 100755
--- a/scripts/terraform_pre_commit.sh
+++ b/scripts/terraform_pre_commit.sh
@@ -1,10 +1,16 @@
 #!/usr/bin/env bash
 
 set -e
 
-cd services/terraform
-echo "formatting services/terraform..."
-terraform fmt -check
-echo "validating services/terraform..."
-terraform validate
-echo "done formatting and validating"
+cd services/terraform/
+echo "Formatting terraform..."
+terraform fmt -recursive
+
+for cfg in dev remote; do
+  pushd "$cfg" >/dev/null
+  echo "Validating '$cfg' terraform configuration..."
+  terraform validate
+  popd >/dev/null
+done
+
+echo "Done formatting and validating terraform"