diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index aa4e6ca63..5be351661 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -1,6 +1,6 @@
 #+COMMENT -*- mode: org -*-
 
-This file containes the change log for the next major version of Spacemacs.
+This file contains the change log for the next major version of Spacemacs.
 
 Use the following template structure and fill it in with your changes.
 When a release will be drafted, the notes will be copied at the top of
@@ -1095,6 +1095,8 @@ Other:
   - Added support for multiple vault password files, see the layer =README.org=
     (thanks to Sylvain Benner)
   - Simplified filename matching re (thanks to Anatoli Babenia)
+  - Added additional YAML paths and refactored =spacemacs--ansible-filename-re=
+    (thanks to Brett Campbell)
 - Fixes:
   - Fixed ansible-doc-mode error on ~SPC h d k~
     (thanks to Codruț Constantin Gușoi)
diff --git a/layers/+tools/ansible/config.el b/layers/+tools/ansible/config.el
index e42473708..9b228467c 100644
--- a/layers/+tools/ansible/config.el
+++ b/layers/+tools/ansible/config.el
@@ -19,4 +19,4 @@ If non-nil then encrypted files are automatically decrypted when opened and
 ;; detect filenames compatible with Ansible's recommended layout.
 ;; http://docs.ansible.com/playbooks_best_practices.html#directory-layout
 (setq spacemacs--ansible-filename-re
-      ".*\\(\\(main\\|site\\|encrypted\\|roles/.+\\)\\.yml\\|group_vars/.+\\|host_vars/.+\\)")
+      "/\\(main\\|site\\|encrypted\\|\\(\\(roles\\|tasks\\|handlers\\|vars\\|defaults\\|meta\\|group_vars\\|host_vars\\)/.+\\)\\)\\.ya?ml$")