diff --git a/.ansible-lint b/.ansible-lint
index 3090307..3b7c373 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -3,20 +3,7 @@
 parseable: true
 quiet: true
 skip_list:
-  - 'schema'
-  - 'no-changed-when'
-  - 'var-spacing'
-  - 'experimental'
-  - 'name[play]'
-  - 'name[casing]'
-  - 'name[template]'
-  - 'key-order[task]'
-  - '204'
-  - '305'
-  - '303'
-  - '403'
-  - '306'
-  - '602'
-  - '208'
+  - 'package-latest'
+  - 'risky-shell-pipe'
 use_default_rules: true
 verbosity: 0
diff --git a/.yamllint b/.yamllint
index ec2d1cd..9c0a13b 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,32 +1,38 @@
 ---
 extends: default
-
+locale: en_US.UTF-8
 ignore: |
     tests/
     molecule/
     .github/
     .gitlab-ci.yml
     *molecule.yml
-
 rules:
-  indentation:
-    # Requiring 4 space indentation
-    spaces: 2
-    # Requiring consistent indentation within a file, either indented or not
-    indent-sequences: consistent
   braces:
     max-spaces-inside: 1
     level: error
   brackets:
     max-spaces-inside: 1
     level: error
+  comments:
+    ignore-shebangs: true
+    min-spaces-from-content: 1 # prettier compatibility
+  comments-indentation: enabled
   empty-lines:
     max: 1
-  line-length: disable
+  indentation:
+    # Requiring 2 space indentation
+    spaces: 2
+    # Requiring consistent indentation within a file, either indented or not
+    indent-sequences: consistent
   key-duplicates: enable
+  line-length: disable
   new-line-at-end-of-file: enable
   new-lines:
     type: unix
+  octal-values:
+    forbid-implicit-octal: true # yamllint defaults to false
+    forbid-explicit-octal: true
   trailing-spaces: enable
   truthy:
     allowed-values: ['true', 'false']