diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d67a3f..02b2553 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 
 ## Unreleased
 ### 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
 ### Fixed
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