diff --git a/.ansible-lint b/.ansible-lint
new file mode 100644
index 0000000000..93b07a23e5
--- /dev/null
+++ b/.ansible-lint
@@ -0,0 +1,3 @@
+---
+skip_list:
+  - 204 # Lines should be no longer than 160 chars
diff --git a/.circleci/config.yml b/.circleci/config.yml
index f71bbe5faf..caa7f46790 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,6 +52,16 @@ orbs:
                 ansible-playbook --syntax-check -e env=development rollback.yml
                 ansible-playbook --syntax-check -e xdebug_tunnel_inventory_host=1 xdebug-tunnel.yml
 
+      lint:
+        executor: python-3
+        steps:
+          - run: python --version
+          - checkout
+          # TODO: Cache pip OR install via apt-get.
+          - run: sudo pip install ansible-lint
+          - run: ansible-lint --version
+          - run: ansible-lint deploy.yml dev.yml server.yml rollback.yml xdebug-tunnel.yml
+
 workflows:
   syntax-check:
     jobs:
@@ -80,3 +90,6 @@ workflows:
           name: syntax-check-python-2-ansible-2.7
           python-version: '2'
           ansible-version: ~=2.7.0
+  lint:
+    jobs:
+      - trellis/lint