diff --git a/.yamllint b/.yamllint
index be2bd18..79d4cf0 100644
--- a/.yamllint
+++ b/.yamllint
@@ -10,13 +10,15 @@ extends: 'default'
 # 3. All YAML files under directory `node_modules/`, introduced during the Travis run
 # 4. Any SLS files under directory `test/`, which are actually state files
 # 5. Any YAML files under directory `.kitchen/`, introduced during local testing
-# 6. Any YAML files using Jinja (result in `yamllint` syntax errors)
+# 6. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
+# 7. Any YAML files using Jinja (result in `yamllint` syntax errors)
 ignore: |
   .cache/
   .git/
   node_modules/
   test/**/states/**/*.sls
   .kitchen/
+  kitchen.vagrant.yml
   mysql/supported_sections.yaml
 
 yaml-files:
diff --git a/CODEOWNERS b/CODEOWNERS
index f756143..4ed2eb9 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -43,6 +43,8 @@
 /Gemfile                                    @saltstack-formulas/ssf
 /Gemfile.lock                               @saltstack-formulas/ssf
 /kitchen.yml                                @saltstack-formulas/ssf
+/kitchen.vagrant.yml                        @saltstack-formulas/ssf
+/kitchen.windows.yml                        @saltstack-formulas/ssf
 /pre-commit_semantic-release.sh             @saltstack-formulas/ssf
 /release-rules.js                           @saltstack-formulas/ssf
 /release.config.js                          @saltstack-formulas/ssf