diff --git a/.kitchen.yml b/.kitchen.yml
index dc2052e..cfabc6d 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,3 +1,4 @@
+---
 driver:
   name: docker_cli
 
@@ -16,7 +17,7 @@ provisioner:
 platforms:
   - name: debian-9
     driver_config:
-      image: nishiki/debian9:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.6' %>
+      image: "nishiki/debian9:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.6' %>"
       command: /bin/systemd
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/.rubocop.yml b/.rubocop.yml
index ab3522c..66555b6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,4 +1,4 @@
-
+---
 AllCops:
   Exclude:
     - db/**/*
diff --git a/.travis.yml b/.travis.yml
index 1d762ac..27ce104 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+---
 sudo: required
 language: ruby
 
@@ -12,6 +13,7 @@ services:
 before_install:
   - bundle install
   - sudo pip install --upgrade pip
+  - sudo pip install yamllint
   - sudo pip install ansible-lint
   - git clone https://github.com/ansible/galaxy-lint-rules.git
 
@@ -20,6 +22,7 @@ script:
   - kitchen conv phpfpm-debian-9 | grep changed=0
   - kitchen verify phpfpm-debian-9
   - ansible-lint -r galaxy-lint-rules/rules .
+  - yamllint .
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..5465b58
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,12 @@
+---
+extends: default
+
+ignore: |
+  .kitchen/*
+  vendor/
+
+rules:
+  line-length:
+    max: 120
+    level: warning
+  truthy: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a83bedc..9de52af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 - test: add ansible-lint
+- test: add yamllint
 
 ## v1.1.0 (2018-09-30)
 - feat: set attributes on homes directories
diff --git a/defaults/main.yml b/defaults/main.yml
index e5985d7..6682c5c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,4 @@
+---
 phpfpm_version: 7.0
 phpfpm_dir: /etc/php/{{ phpfpm_version }}/fpm
 phpfpm_dir_log: /var/log/phpfpm
diff --git a/handlers/main.yml b/handlers/main.yml
index 2ab3f34..6543315 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,3 +1,4 @@
+---
 - name: reload php-fpm
   systemd:
     name: 'php{{ phpfpm_version }}-fpm'
diff --git a/meta/main.yml b/meta/main.yml
index 5df812e..730a5c8 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,3 +1,4 @@
+---
 galaxy_info:
   role_name: phpfpm
   author: Adrien Waksberg
diff --git a/tasks/base.yml b/tasks/base.yml
index 7d43b6b..63d128c 100644
--- a/tasks/base.yml
+++ b/tasks/base.yml
@@ -1,3 +1,4 @@
+---
 - name: install php-fpm package
   package:
     name: 'php{{ phpfpm_version }}-fpm'
diff --git a/tasks/main.yml b/tasks/main.yml
index 2d448ec..490eb5f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - import_tasks: base.yml
   tags: phpfpm
 
diff --git a/tasks/pools.yml b/tasks/pools.yml
index 1e02ce1..803018c 100644
--- a/tasks/pools.yml
+++ b/tasks/pools.yml
@@ -1,3 +1,4 @@
+---
 - name: check if pools log files exist
   stat:
     path: '{{ phpfpm_dir_log }}/{{ item[0].name }}.{{ item[1] }}'
diff --git a/test/integration/phpfpm/default.yml b/test/integration/phpfpm/default.yml
index 7eb62ce..2c6f213 100644
--- a/test/integration/phpfpm/default.yml
+++ b/test/integration/phpfpm/default.yml
@@ -1,3 +1,4 @@
+---
 - hosts: localhost
   connection: local
   vars: