diff --git a/.yamllint b/.yamllint
index a8a398bba56878aff4663138ff106a0e1fba94a2..8d489a5cb564ae9d7dad9860acb4c39613467d2c 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,7 +1,5 @@
 ---
-# based on documentation available at
-# https://yamllint.readthedocs.io/en/stable/rules.html
-
+# Based on ansible-lint config
 extends: default
 
 rules:
@@ -11,15 +9,29 @@ rules:
   brackets:
     max-spaces-inside: 1
     level: error
+  colons:
+    max-spaces-after: -1
+    level: error
+  commas:
+    max-spaces-after: -1
+    level: error
   comments:
-    min-spaces-from-content: 4
+    min-spaces-from-content: 1 # prettier compatibility
   comments-indentation: disable
-  document-end: disable
-  document-start:
-    level: warning
-  octal-values:
-    forbid-explicit-octal: false
-  line-length: disable
-  truthy: enable
+  document-start: disable
   empty-lines:
     max: 3
+    level: error
+  hyphens:
+    level: error
+  indentation: disable
+  key-duplicates: enable
+  line-length: disable
+  new-line-at-end-of-file: disable
+  new-lines:
+    type: unix
+  octal-values:
+    forbid-implicit-octal: true    # yamllint defaults to false
+    forbid-explicit-octal: true    # yamllint defaults to false
+  trailing-spaces: disable
+  truthy: disable