diff --git a/galaxy.yml b/galaxy.yml
index 6f2a5c04937e5d7b6facee86259416264b67e9c0..9bd347608a59f78dbbf76685dfb77e2e0e598858 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,3 +1,4 @@
+---
 namespace: "freeipa"
 name: "ansible_freeipa"
 version: "A.B.C"
diff --git a/meta/runtime.yml b/meta/runtime.yml
index aba42e9b2bfff682d48be7365887fbfebc8cd3da..18dabe9d7be39d4eae2db4408c3f5e49504381dc 100644
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -1 +1,2 @@
+---
 requires_ansible: ">=2.9"
diff --git a/molecule/resources/playbooks/prepare-common.yml b/molecule/resources/playbooks/prepare-common.yml
index 7149e72e6996fb3b6f0cfeb4b3010bedb5b3e840..246f2940b83e0be2495dd497bd606519f00b22c6 100644
--- a/molecule/resources/playbooks/prepare-common.yml
+++ b/molecule/resources/playbooks/prepare-common.yml
@@ -1,3 +1,4 @@
+---
 # IPA depends on IPv6 and without it dirsrv service won't start.
 - name: Ensure IPv6 is ENABLED
   sysctl:
diff --git a/playbooks/dnszone/dnszone-all-params.yml b/playbooks/dnszone/dnszone-all-params.yml
index c02485f58285ef94fbb54f434d6dc09cdbcb842c..79747d2a975b53e4caa9630442294a0f7ceb2c81 100644
--- a/playbooks/dnszone/dnszone-all-params.yml
+++ b/playbooks/dnszone/dnszone-all-params.yml
@@ -1,3 +1,4 @@
+---
 - name: dnszone present
   hosts: ipaserver
   become: true
diff --git a/playbooks/dnszone/dnszone-present.yml b/playbooks/dnszone/dnszone-present.yml
index c310631790787638074f070ab13d7ff0d4b46ed2..04d07ba01f26bba153bdc57889bfcf9ace34acc3 100644
--- a/playbooks/dnszone/dnszone-present.yml
+++ b/playbooks/dnszone/dnszone-present.yml
@@ -1,3 +1,4 @@
+---
 - name: dnszone present
   hosts: ipaserver
   become: true
diff --git a/playbooks/host/host-member-certificate-absent.yml b/playbooks/host/host-member-certificate-absent.yml
index 841b39cddc672be3d0a6f03bde1ecc3582d5ac09..0e9d31234a23601db66d1188ba3666664a69581d 100644
--- a/playbooks/host/host-member-certificate-absent.yml
+++ b/playbooks/host/host-member-certificate-absent.yml
@@ -1,3 +1,4 @@
+---
 - name: Host member certificate absent
   hosts: ipaserver
   become: true
diff --git a/playbooks/host/host-member-certificate-present.yml b/playbooks/host/host-member-certificate-present.yml
index 8071a9425b609751a31144d9dae2ea4e717b38ab..5ddb2f883c5ec76107dbd5f93e92cd029487ffb5 100644
--- a/playbooks/host/host-member-certificate-present.yml
+++ b/playbooks/host/host-member-certificate-present.yml
@@ -1,3 +1,4 @@
+---
 - name: Host member certificate present
   hosts: ipaserver
   become: true
diff --git a/playbooks/host/host-present-with-certificate.yml b/playbooks/host/host-present-with-certificate.yml
index 919d7c0bbe4ed3f6d53b59d0a3b12a9bd424c9a3..a5658d448f92375c2248f4d88d8b71e5f46b870b 100644
--- a/playbooks/host/host-present-with-certificate.yml
+++ b/playbooks/host/host-present-with-certificate.yml
@@ -1,3 +1,4 @@
+---
 - name: Host present with certificate
   hosts: ipaserver
   become: true
diff --git a/roles/ipabackup/meta/main.yml b/roles/ipabackup/meta/main.yml
index db6732af7d7f74b929f0f90fd16cde8494434c3a..6131e0d73d422b01c8a309f386e4f1356b8e3689 100644
--- a/roles/ipabackup/meta/main.yml
+++ b/roles/ipabackup/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies: []
 
 galaxy_info:
diff --git a/roles/ipabackup/vars/Fedora.yml b/roles/ipabackup/vars/Fedora.yml
index 7711204114f8840dfecd58b17c3fb23c5e607bd4..549f32bddf60bf5130e654aebe594cf3ac677fc9 100644
--- a/roles/ipabackup/vars/Fedora.yml
+++ b/roles/ipabackup/vars/Fedora.yml
@@ -1,3 +1,6 @@
+# defaults file for ipabackup
+# vars/Fedora.yml
+---
 ipaserver_packages: [ "freeipa-server" ]
 ipaserver_packages_dns: [ "freeipa-server-dns" ]
 ipaserver_packages_adtrust: [ "freeipa-server-trust-ad" ]
diff --git a/roles/ipabackup/vars/RedHat-7.yml b/roles/ipabackup/vars/RedHat-7.yml
index 1186375745dd9beab8e22733f7582dbb9eeb188d..126f0921368d7c193e84d09da85530ab11f5a914 100644
--- a/roles/ipabackup/vars/RedHat-7.yml
+++ b/roles/ipabackup/vars/RedHat-7.yml
@@ -1,6 +1,7 @@
-# defaults file for ipaserver
-# vars/rhel.yml
+# defaults file for ipabackup
+# vars/RedHat-7.yml
+---
 ipaserver_packages: [ "ipa-server", "libselinux-python" ]
 ipaserver_packages_dns: [ "ipa-server-dns" ]
 ipaserver_packages_adtrust: [ "ipa-server-trust-ad" ]
-ipaserver_packages_firewalld: [ "firewalld" ]
\ No newline at end of file
+ipaserver_packages_firewalld: [ "firewalld" ]
diff --git a/roles/ipabackup/vars/RedHat-8.yml b/roles/ipabackup/vars/RedHat-8.yml
index 7f5ae4644180195d9f956dd7fb2b641b992d67aa..55a154d85cd5994ad2801264c94a6f3d1b0300ac 100644
--- a/roles/ipabackup/vars/RedHat-8.yml
+++ b/roles/ipabackup/vars/RedHat-8.yml
@@ -1,5 +1,6 @@
-# defaults file for ipaserver
+# defaults file for ipabackup
 # vars/RedHat-8.yml
+---
 ipaserver_packages: [ "@idm:DL1/server" ]
 ipaserver_packages_dns: [ "@idm:DL1/dns" ]
 ipaserver_packages_adtrust: [ "@idm:DL1/adtrust" ]
diff --git a/roles/ipabackup/vars/Ubuntu.yml b/roles/ipabackup/vars/Ubuntu.yml
index d0e01ea8a0a20451821e1d0a0c043f1d78b2c3cb..ea6ea233a849d618580a0b6a826d16827320149b 100644
--- a/roles/ipabackup/vars/Ubuntu.yml
+++ b/roles/ipabackup/vars/Ubuntu.yml
@@ -1,4 +1,6 @@
+# defaults file for ipabackup
 # vars/Ubuntu.yml
+---
 ipaserver_packages: [ "freeipa-server" ]
 ipaserver_packages_dns: [ "freeipa-server-dns" ]
 ipaserver_packages_adtrust: [ "freeipa-server-trust-ad" ]
diff --git a/roles/ipabackup/vars/default.yml b/roles/ipabackup/vars/default.yml
index 4d28ac65f73bd3a1c5ca0ad9f6f7f874740c533e..0300948b6de96b9dead2ee8eb7a1a6a3ef0a3022 100644
--- a/roles/ipabackup/vars/default.yml
+++ b/roles/ipabackup/vars/default.yml
@@ -1,5 +1,6 @@
-# defaults file for ipaserver
+# defaults file for ipabackup
 # vars/default.yml
+---
 ipaserver_packages: [ "ipa-server" ]
 ipaserver_packages_dns: [ "ipa-server-dns" ]
 ipaserver_packages_adtrust: [ "freeipa-server-trust-ad" ]
diff --git a/roles/ipaclient/meta/main.yml b/roles/ipaclient/meta/main.yml
index 5c0cb49c53a54e55cb36ecb9133620af83ba5ded..356b2db01ceadba6783d7305ca8e3d6085d5161e 100644
--- a/roles/ipaclient/meta/main.yml
+++ b/roles/ipaclient/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies: []
 
 galaxy_info:
diff --git a/roles/ipaclient/vars/Debian.yml b/roles/ipaclient/vars/Debian.yml
index 96d9c326da3592cba52a8143886a404863a74b18..efa7c4d44d54dd1b25c1b7b2d138b29d99848e2f 100644
--- a/roles/ipaclient/vars/Debian.yml
+++ b/roles/ipaclient/vars/Debian.yml
@@ -1,2 +1,4 @@
+# defaults file for ipaclient
 # vars/Debian.yml
+---
 ipaclient_packages: [ "freeipa-client" ]
diff --git a/roles/ipaclient/vars/Fedora-25.yml b/roles/ipaclient/vars/Fedora-25.yml
index 1a62ffa2f7d3edd5bcd8acacd5bd4c4a4fc3bddf..9999b3317a634bc9e040a62f3389c17ab5fe8e8f 100644
--- a/roles/ipaclient/vars/Fedora-25.yml
+++ b/roles/ipaclient/vars/Fedora-25.yml
@@ -1,2 +1,5 @@
+# defaults file for ipaclient
+# vars/Fedora-25.yml
+---
 ipaclient_packages: [ "ipa-client", "libselinux-python" ]
-#ansible_python_interpreter: '/usr/bin/python2'
\ No newline at end of file
+#ansible_python_interpreter: '/usr/bin/python2'
diff --git a/roles/ipaclient/vars/Fedora-26.yml b/roles/ipaclient/vars/Fedora-26.yml
index 1a62ffa2f7d3edd5bcd8acacd5bd4c4a4fc3bddf..12722c8a829c4798c38c0b9ab43df575293c914f 100644
--- a/roles/ipaclient/vars/Fedora-26.yml
+++ b/roles/ipaclient/vars/Fedora-26.yml
@@ -1,2 +1,5 @@
+# defaults file for ipaclient
+# vars/Fedora-26.yml
+---
 ipaclient_packages: [ "ipa-client", "libselinux-python" ]
-#ansible_python_interpreter: '/usr/bin/python2'
\ No newline at end of file
+#ansible_python_interpreter: '/usr/bin/python2'
diff --git a/roles/ipaclient/vars/RedHat-7.3.yml b/roles/ipaclient/vars/RedHat-7.3.yml
index 2501eab533a301879d15b3027768a4aaf262fcaa..51d2b10d1f2c23a49b4779ff6df923f4135aa0f2 100644
--- a/roles/ipaclient/vars/RedHat-7.3.yml
+++ b/roles/ipaclient/vars/RedHat-7.3.yml
@@ -1,4 +1,5 @@
 # defaults file for ipaclient
-# vars/rhel.yml
+# vars/RedHat-7.3.yml
+---
 ipaclient_packages: [ "ipa-client", "ipa-admintools", "libselinux-python" ]
 #ansible_python_interpreter: '/usr/bin/python2'
diff --git a/roles/ipaclient/vars/RedHat-7.yml b/roles/ipaclient/vars/RedHat-7.yml
index 51ab7bfce86b6e0e81cfca4fb9d616936e18cd83..c2ea3ca58002b09f73bd37f41b7d5d76b0c96655 100644
--- a/roles/ipaclient/vars/RedHat-7.yml
+++ b/roles/ipaclient/vars/RedHat-7.yml
@@ -1,4 +1,5 @@
 # defaults file for ipaclient
-# vars/rhel.yml
+# vars/RedHat-7
+---
 ipaclient_packages: [ "ipa-client", "libselinux-python" ]
 #ansible_python_interpreter: '/usr/bin/python2'
diff --git a/roles/ipaclient/vars/RedHat-8.yml b/roles/ipaclient/vars/RedHat-8.yml
index f2b883c1c1a35f3a3d02177086e775eb66411a10..65b554e0ebb2ffed61ff74378b54ff5acc7617a4 100644
--- a/roles/ipaclient/vars/RedHat-8.yml
+++ b/roles/ipaclient/vars/RedHat-8.yml
@@ -1,3 +1,4 @@
 # defaults file for ipaclient
 # vars/RedHat-8.yml
+---
 ipaclient_packages: [ "@idm:DL1/client" ]
diff --git a/roles/ipaclient/vars/default.yml b/roles/ipaclient/vars/default.yml
index ff34748a4e40a07c413f4b4b3f845bd1c62aa4f5..a28d81a133a8b32cc31ad1d5797469419c03fc34 100644
--- a/roles/ipaclient/vars/default.yml
+++ b/roles/ipaclient/vars/default.yml
@@ -1,4 +1,5 @@
 # defaults file for ipaclient
 # vars/default.yml
+---
 ipaclient_packages: [ "ipa-client", "python3-libselinux" ]
 #ansible_python_interpreter: '/usr/bin/python3'
diff --git a/roles/ipareplica/meta/main.yml b/roles/ipareplica/meta/main.yml
index d7964820a92e4c5ccdae556cc2012cdc5ba2c185..6b1021ad4bd84f25555aa84ca76a72ec9915687d 100644
--- a/roles/ipareplica/meta/main.yml
+++ b/roles/ipareplica/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies: []
 
 galaxy_info:
diff --git a/roles/ipareplica/vars/Fedora-25.yml b/roles/ipareplica/vars/Fedora-25.yml
index ce981ff81f3a352532d0ac7f5bfb38db90a27fe4..3ed54d5a4f68e8f6c49ba3d98926cb6ea3b71fa8 100644
--- a/roles/ipareplica/vars/Fedora-25.yml
+++ b/roles/ipareplica/vars/Fedora-25.yml
@@ -1,6 +1,7 @@
-# Fedora-25 defaults file for ipareplica
+# defaults file for ipareplica
 # vars/Fedora-25.yml
+---
 ipareplica_packages: [ "ipa-server", "libselinux-python" ]
 ipareplica_packages_dns: [ "ipa-server-dns" ]
 ipareplica_packages_adtrust: [ "ipa-server-trust-ad" ]
-ipareplica_packages_firewalld: [ "firewalld" ]
\ No newline at end of file
+ipareplica_packages_firewalld: [ "firewalld" ]
diff --git a/roles/ipareplica/vars/Fedora-26.yml b/roles/ipareplica/vars/Fedora-26.yml
index 5a65e43a895cf3a1c41d3379f659652ba8096d02..df2d71623dc36c8bca75527377a7d52f752ce17e 100644
--- a/roles/ipareplica/vars/Fedora-26.yml
+++ b/roles/ipareplica/vars/Fedora-26.yml
@@ -1,6 +1,7 @@
-# Fedora defaults file for ipareplica
+# defaults file for ipareplica
 # vars/Fedora-26.yml
+---
 ipareplica_packages: [ "ipa-server", "libselinux-python" ]
 ipareplica_packages_dns: [ "ipa-server-dns" ]
 ipareplica_packages_adtrust: [ "ipa-server-trust-ad" ]
-ipareplica_packages_firewalld: [ "firewalld" ]
\ No newline at end of file
+ipareplica_packages_firewalld: [ "firewalld" ]
diff --git a/roles/ipareplica/vars/Fedora-27.yml b/roles/ipareplica/vars/Fedora-27.yml
index 5d6f02a1eaaf51f4cd2f3ad63d8d543bfa033bb6..c5ed279bf11fb395a693bc3f26404edc19b0cfb6 100644
--- a/roles/ipareplica/vars/Fedora-27.yml
+++ b/roles/ipareplica/vars/Fedora-27.yml
@@ -1,6 +1,7 @@
-# Fedora defaults file for ipareplica
-# vars/Fedora.yml
+# defaults file for ipareplica
+# vars/Fedora-27.yml
+---
 ipareplica_packages: [ "ipa-server", "libselinux-python" ]
 ipareplica_packages_dns: [ "ipa-server-dns" ]
 ipareplica_packages_adtrust: [ "ipa-server-trust-ad" ]
-ipareplica_packages_firewalld: [ "firewalld" ]
\ No newline at end of file
+ipareplica_packages_firewalld: [ "firewalld" ]
diff --git a/roles/ipareplica/vars/Fedora.yml b/roles/ipareplica/vars/Fedora.yml
index f19fb996943418c712a20402e6aad2e09433dc60..ffbdaeec4f5a49813f809ed5669368d3114997f4 100644
--- a/roles/ipareplica/vars/Fedora.yml
+++ b/roles/ipareplica/vars/Fedora.yml
@@ -1,6 +1,7 @@
-# Fedora defaults file for ipareplica
+# defaults file for ipareplica
 # vars/Fedora.yml
+---
 ipareplica_packages: [ "freeipa-server", "python3-libselinux" ]
 ipareplica_packages_dns: [ "freeipa-server-dns" ]
 ipareplica_packages_adtrust: [ "freeipa-server-trust-ad" ]
-ipareplica_packages_firewalld: [ "firewalld" ]
\ No newline at end of file
+ipareplica_packages_firewalld: [ "firewalld" ]
diff --git a/roles/ipareplica/vars/RedHat-7.yml b/roles/ipareplica/vars/RedHat-7.yml
index 614de3e5a4c20c71714a1a0c7dc96b8f7e4c8ff7..34843523ee22d5bfee5b75866ae0bc7e4e96d8d3 100644
--- a/roles/ipareplica/vars/RedHat-7.yml
+++ b/roles/ipareplica/vars/RedHat-7.yml
@@ -1,6 +1,7 @@
 # defaults file for ipareplica
 # vars/RedHat-7.yml
+---
 ipareplica_packages: [ "ipa-server", "libselinux-python" ]
 ipareplica_packages_dns: [ "ipa-server-dns" ]
 ipareplica_packages_adtrust: [ "ipa-server-trust-ad" ]
-ipareplica_packages_firewalld: [ "firewalld" ]
\ No newline at end of file
+ipareplica_packages_firewalld: [ "firewalld" ]
diff --git a/roles/ipareplica/vars/RedHat-8.yml b/roles/ipareplica/vars/RedHat-8.yml
index 025730253dfa65685d81a61da93de0eb4bab9634..a1b52994e14495e6420ac72c7986c08b31ac2f89 100644
--- a/roles/ipareplica/vars/RedHat-8.yml
+++ b/roles/ipareplica/vars/RedHat-8.yml
@@ -1,5 +1,6 @@
 # defaults file for ipareplica
 # vars/RedHat-8.yml
+---
 ipareplica_packages: [ "@idm:DL1/server" ]
 ipareplica_packages_dns: [ "@idm:DL1/dns" ]
 ipareplica_packages_adtrust: [ "@idm:DL1/adtrust" ]
diff --git a/roles/ipareplica/vars/Ubuntu.yml b/roles/ipareplica/vars/Ubuntu.yml
index 7cdabbfbde0e0f6d017db9e668b3550a37e0fa26..23c2e89db26f4ff0297c79463e81e06c76d19aa8 100644
--- a/roles/ipareplica/vars/Ubuntu.yml
+++ b/roles/ipareplica/vars/Ubuntu.yml
@@ -1,4 +1,6 @@
+# defaults file for ipareplica
 # vars/Ubuntu.yml
+---
 ipareplica_packages: [ "freeipa-server" ]
 ipareplica_packages_dns: [ "freeipa-server-dns" ]
 ipareplica_packages_adtrust: [ "freeipa-server-trust-ad" ]
diff --git a/roles/ipareplica/vars/default.yml b/roles/ipareplica/vars/default.yml
index ce7393a1b2ee4fa668f7b763716f61bf6414196e..0afedeb377e907e63adc1df1ef30dc90e713e868 100644
--- a/roles/ipareplica/vars/default.yml
+++ b/roles/ipareplica/vars/default.yml
@@ -1,5 +1,6 @@
 # defaults file for ipareplica
 # vars/default.yml
+---
 ipareplica_packages: [ "freeipa-server", "python3-libselinux" ]
 ipareplica_packages_dns: [ "freeipa-server-dns" ]
 ipareplica_packages_adtrust: [ "freeipa-server-trust-ad" ]
diff --git a/roles/ipaserver/meta/main.yml b/roles/ipaserver/meta/main.yml
index 99abca344839ae4d235ebb35f3cc2946f68f7d1d..86a05f9b73b9dcbd1fed6422a5fde26cefe50f41 100644
--- a/roles/ipaserver/meta/main.yml
+++ b/roles/ipaserver/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies: []
 
 galaxy_info:
diff --git a/roles/ipaserver/tasks/copy_external_cert.yml b/roles/ipaserver/tasks/copy_external_cert.yml
index 84eee2360230340134965d8d626a0381c4dd2d79..7352f835cd99d6a59016b12a454d445e95a49296 100644
--- a/roles/ipaserver/tasks/copy_external_cert.yml
+++ b/roles/ipaserver/tasks/copy_external_cert.yml
@@ -1,3 +1,4 @@
+---
 - name: Install - Initialize ipaserver_external_cert_files
   set_fact:
      ipaserver_external_cert_files: []
diff --git a/roles/ipaserver/vars/Fedora-25.yml b/roles/ipaserver/vars/Fedora-25.yml
index 374056c0aa3cdff4f8a350dcc64debf1e25fe4fb..eaf249d9bced6b499f49a8dcb3133c7455d61cc6 100644
--- a/roles/ipaserver/vars/Fedora-25.yml
+++ b/roles/ipaserver/vars/Fedora-25.yml
@@ -1,4 +1,7 @@
+# defaults file for ipaserver
+# vars/Fedora-25.yml
+---
 ipaserver_packages: [ "ipa-server", "libselinux-python" ]
 ipaserver_packages_dns: [ "ipa-server-dns" ]
 ipaserver_packages_adtrust: [ "ipa-server-trust-ad" ]
-ipaserver_packages_firewalld: [ "firewalld" ]
\ No newline at end of file
+ipaserver_packages_firewalld: [ "firewalld" ]
diff --git a/roles/ipaserver/vars/Fedora-26.yml b/roles/ipaserver/vars/Fedora-26.yml
index 374056c0aa3cdff4f8a350dcc64debf1e25fe4fb..9e9a4d68389a53768a792c1045d99776d9be342a 100644
--- a/roles/ipaserver/vars/Fedora-26.yml
+++ b/roles/ipaserver/vars/Fedora-26.yml
@@ -1,4 +1,7 @@
+# defaults file for ipaserver
+# vars/Fedora-26.yml
+---
 ipaserver_packages: [ "ipa-server", "libselinux-python" ]
 ipaserver_packages_dns: [ "ipa-server-dns" ]
 ipaserver_packages_adtrust: [ "ipa-server-trust-ad" ]
-ipaserver_packages_firewalld: [ "firewalld" ]
\ No newline at end of file
+ipaserver_packages_firewalld: [ "firewalld" ]
diff --git a/roles/ipaserver/vars/Fedora-27.yml b/roles/ipaserver/vars/Fedora-27.yml
index b8bfb5774bf5587ee8b908346f524e6ad73951fc..ffa2f0da5657a0d34596030212868ba91d21c5b7 100644
--- a/roles/ipaserver/vars/Fedora-27.yml
+++ b/roles/ipaserver/vars/Fedora-27.yml
@@ -1,3 +1,6 @@
+# defaults file for ipaserver
+# vars/Fedora-27.yml
+---
 ipaserver_packages: [ "ipa-server", "libselinux-python" ]
 ipaserver_packages_dns: [ "ipa-server-dns" ]
 ipaserver_packages_adtrust: [ "ipa-server-trust-ad" ]
diff --git a/roles/ipaserver/vars/Fedora.yml b/roles/ipaserver/vars/Fedora.yml
index 55a383828196a1b810c4a3faf600944d21deeffa..147013408771b49aaa5409064566624e652ad65a 100644
--- a/roles/ipaserver/vars/Fedora.yml
+++ b/roles/ipaserver/vars/Fedora.yml
@@ -1,4 +1,7 @@
+# defaults file for ipaserver
+# vars/Fedora.yml
+---
 ipaserver_packages: [ "freeipa-server", "python3-libselinux" ]
 ipaserver_packages_dns: [ "freeipa-server-dns" ]
 ipaserver_packages_adtrust: [ "freeipa-server-trust-ad" ]
-ipaserver_packages_firewalld: [ "firewalld" ]
\ No newline at end of file
+ipaserver_packages_firewalld: [ "firewalld" ]
diff --git a/roles/ipaserver/vars/RedHat-7.yml b/roles/ipaserver/vars/RedHat-7.yml
index 1186375745dd9beab8e22733f7582dbb9eeb188d..3c524898ae056fb79771214cb95a59e1a06bbcf2 100644
--- a/roles/ipaserver/vars/RedHat-7.yml
+++ b/roles/ipaserver/vars/RedHat-7.yml
@@ -1,6 +1,7 @@
 # defaults file for ipaserver
-# vars/rhel.yml
+# vars/RedHat-7.yml
+---
 ipaserver_packages: [ "ipa-server", "libselinux-python" ]
 ipaserver_packages_dns: [ "ipa-server-dns" ]
 ipaserver_packages_adtrust: [ "ipa-server-trust-ad" ]
-ipaserver_packages_firewalld: [ "firewalld" ]
\ No newline at end of file
+ipaserver_packages_firewalld: [ "firewalld" ]
diff --git a/roles/ipaserver/vars/RedHat-8.yml b/roles/ipaserver/vars/RedHat-8.yml
index 7f5ae4644180195d9f956dd7fb2b641b992d67aa..9efe0cff0fffd06cf12791e10b4d26294138b20a 100644
--- a/roles/ipaserver/vars/RedHat-8.yml
+++ b/roles/ipaserver/vars/RedHat-8.yml
@@ -1,5 +1,6 @@
 # defaults file for ipaserver
 # vars/RedHat-8.yml
+---
 ipaserver_packages: [ "@idm:DL1/server" ]
 ipaserver_packages_dns: [ "@idm:DL1/dns" ]
 ipaserver_packages_adtrust: [ "@idm:DL1/adtrust" ]
diff --git a/roles/ipaserver/vars/Ubuntu.yml b/roles/ipaserver/vars/Ubuntu.yml
index d0e01ea8a0a20451821e1d0a0c043f1d78b2c3cb..2d58f4715f22d357bfd7e9d6c073859b924988d4 100644
--- a/roles/ipaserver/vars/Ubuntu.yml
+++ b/roles/ipaserver/vars/Ubuntu.yml
@@ -1,4 +1,6 @@
+# defaults file for ipaserver
 # vars/Ubuntu.yml
+---
 ipaserver_packages: [ "freeipa-server" ]
 ipaserver_packages_dns: [ "freeipa-server-dns" ]
 ipaserver_packages_adtrust: [ "freeipa-server-trust-ad" ]
diff --git a/roles/ipaserver/vars/default.yml b/roles/ipaserver/vars/default.yml
index 9f6d58a432de19fb9864d7a635f5e31581293940..395bb075ebce834bdf901e1dbfce30771803750a 100644
--- a/roles/ipaserver/vars/default.yml
+++ b/roles/ipaserver/vars/default.yml
@@ -1,5 +1,6 @@
 # defaults file for ipaserver
 # vars/default.yml
+---
 ipaserver_packages: [ "ipa-server", "python3-libselinux" ]
 ipaserver_packages_dns: [ "ipa-server-dns" ]
 ipaserver_packages_adtrust: [ "freeipa-server-trust-ad" ]
diff --git a/tests/azure/templates/build_container.yml b/tests/azure/templates/build_container.yml
index c77e274558e16adf9b85e265d37a2b1f1d3e028b..b474c9641d34b7bca18ebe10154b29261689f0a0 100644
--- a/tests/azure/templates/build_container.yml
+++ b/tests/azure/templates/build_container.yml
@@ -1,4 +1,4 @@
-
+---
 parameters:
   - name: job_name_suffix
     type: string
diff --git a/tests/azure/templates/group_tests.yml b/tests/azure/templates/group_tests.yml
index f0f11accc3adf8ed82a5823cac2f98e3920263f0..4cabeab17d209428c04e6f8242ec4070480064d8 100644
--- a/tests/azure/templates/group_tests.yml
+++ b/tests/azure/templates/group_tests.yml
@@ -1,4 +1,4 @@
-
+---
 parameters:
   - name: scenario
     type: string
diff --git a/tests/azure/templates/playbook_tests.yml b/tests/azure/templates/playbook_tests.yml
index 6a8ac787bd06fb385a3075f45b26b3cc0da53443..c5f2d160e13043635cca37f469dde6291a0100c9 100644
--- a/tests/azure/templates/playbook_tests.yml
+++ b/tests/azure/templates/playbook_tests.yml
@@ -1,4 +1,4 @@
-
+---
 parameters:
   - name: group_number
     type: number
diff --git a/tests/azure/templates/pytest_tests.yml b/tests/azure/templates/pytest_tests.yml
index 80db74f5813f2b1fa5d863d65d00dd148776b9ec..265a9191f24d00349f5d300520b9f5019f4eedf8 100644
--- a/tests/azure/templates/pytest_tests.yml
+++ b/tests/azure/templates/pytest_tests.yml
@@ -1,4 +1,4 @@
-
+---
 parameters:
 - name: build_number
   type: string
diff --git a/tests/vault/env_cleanup.yml b/tests/vault/env_cleanup.yml
index 30c0e0d74e8dc43a3bf2720e75f0e9ee8eab7f1f..85f4d10c9e9d6eb912295aaeb5766ffd538e71f6 100644
--- a/tests/vault/env_cleanup.yml
+++ b/tests/vault/env_cleanup.yml
@@ -1,5 +1,5 @@
-# Tasks executed to clean up test environment for Vault module.
-
+---
+  # Tasks executed to clean up test environment for Vault module.
   - name: Ensure user vaults are absent
     ipavault:
       ipaadmin_password: SomeADMINpassword