diff --git a/.ansible-lint b/.ansible-lint
index 148ddda4..b8c04701 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,3 +1,4 @@
 ---
 warn_list:
   - '106'
+  - '303'
diff --git a/.yamllint b/.yamllint
index a74c7d25..88276760 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,3 +1,5 @@
+---
+# Based on ansible-lint config
 extends: default
 
 rules:
@@ -7,10 +9,25 @@ rules:
   brackets:
     max-spaces-inside: 1
     level: error
+  colons:
+    max-spaces-after: -1
+    level: error
+  commas:
+    max-spaces-after: -1
+    level: error
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines:
+    max: 3
+    level: error
+  hyphens:
+    level: error
+  indentation: disable
+  key-duplicates: enable
   line-length: disable
-  # NOTE(retr0h): Templates no longer fail this lint rule.
-  #               Uncomment if running old Molecule templates.
-  # truthy: disable
-ignore: |
-  .travis.yml
-  config.yml
+  new-line-at-end-of-file: disable
+  new-lines:
+    type: unix
+  trailing-spaces: disable
+  truthy: disable