diff --git a/CHANGELOG.md b/CHANGELOG.md
index d533cf7..69872e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,13 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 ### Fixed
 ### Removed
 
+## [2.5.0](https://github.com/idealista/cookiecutter-ansible-role/tree/2.5.0)
+### [Full Changelog](https://github.com/idealista/cookiecutter-ansible-role/compare/2.4.1...2.5.0)
+### Added
+- *[#57](https://github.com/idealista/cookiecutter-ansible-role/issues/57) Added gitattributes file* @blalop
+### Changed
+- *[#55](https://github.com/idealista/cookiecutter-ansible-role/issues/55) Excluded non-role files from linting* @blalop
+
 ## [2.4.1](https://github.com/idealista/cookiecutter-ansible-role/tree/2.4.1)
 ### [Full Changelog](https://github.com/idealista/cookiecutter-ansible-role/compare/2.4.0...2.4.1)
 ### Fixed
diff --git a/{{cookiecutter.app_name}}_role/.ansible-lint b/{{cookiecutter.app_name}}_role/.ansible-lint
index 06e03cc..59eca22 100644
--- a/{{cookiecutter.app_name}}_role/.ansible-lint
+++ b/{{cookiecutter.app_name}}_role/.ansible-lint
@@ -1,5 +1,7 @@
 exclude_paths:
   - ./molecule
+  - ./.travis.yml
+  - ./.github
 parseable: true
 skip_list:
   - '204'
diff --git a/{{cookiecutter.app_name}}_role/.yamllint b/{{cookiecutter.app_name}}_role/.yamllint
index 50e2ae9..dd13647 100644
--- a/{{cookiecutter.app_name}}_role/.yamllint
+++ b/{{cookiecutter.app_name}}_role/.yamllint
@@ -4,6 +4,8 @@ extends: default
 
 ignore: |
   molecule/**/tests/
+  .github
+  .travis.yml
 
 rules:
   braces:
diff --git a/{{cookiecutter.app_name}}_role/{% raw %}.gitattributes{% endraw %} b/{{cookiecutter.app_name}}_role/{% raw %}.gitattributes{% endraw %}
new file mode 100644
index 0000000..aae6a25
--- /dev/null
+++ b/{{cookiecutter.app_name}}_role/{% raw %}.gitattributes{% endraw %}	
@@ -0,0 +1,2 @@
+*.yml linguist-detectable=true
+*.yaml linguist-detectable=true