diff --git a/.yamllint b/.yamllint
index eb6a5ad8..6e6c8d5e 100644
--- a/.yamllint
+++ b/.yamllint
@@ -7,10 +7,12 @@ extends: default
 # Files to ignore completely
 # 1. All YAML files under directory `node_modules/`, introduced during the Travis run
 # 2. Any SLS files under directory `test/`, which are actually state files
-# 3. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
+# 3. Any YAML files under directory `.kitchen/`, introduced during local testing
+# 4. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
 ignore: |
   node_modules/
   test/**/states/**/*.sls
+  .kitchen/
   pillar.example
   postgres/codenamemap.yaml
   postgres/osfamilymap.yaml
@@ -35,3 +37,6 @@ rules:
     # Increase from default of `80`
     # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
     max: 88
+  octal-values:
+    forbid-implicit-octal: true
+    forbid-explicit-octal: true