diff --git a/CHANGELOG.md b/CHANGELOG.md
index d473060..77e7e70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog).
 
 ## Unreleased
+### Fixed
+- *[#40](https://github.com/idealista/cookiecutter-ansible-role/issues/40) Updated yamllint configuration* @frantsao
 ### Changed
 - *[#38](https://github.com/idealista/cookiecutter-ansible-role/pull/38) Bump goss version from 0.3.11 to 0.3.14* @vicsufer
 ### Removed
diff --git a/{{cookiecutter.app_name}}_role/.yamllint b/{{cookiecutter.app_name}}_role/.yamllint
index 84510f6..50e2ae9 100644
--- a/{{cookiecutter.app_name}}_role/.yamllint
+++ b/{{cookiecutter.app_name}}_role/.yamllint
@@ -3,9 +3,7 @@
 extends: default
 
 ignore: |
-  .travis.yml
-  molecule/
-  tests/
+  molecule/**/tests/
 
 rules:
   braces:
@@ -20,20 +18,13 @@ rules:
   commas:
     max-spaces-after: -1
     level: error
-  comments: disable
-  comments-indentation: disable
-  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
-  trailing-spaces: disable
   truthy: disable
-  
\ No newline at end of file