diff --git a/.ansible-lint.yml b/.ansible-lint.yml
new file mode 100644
index 0000000..3026a73
--- /dev/null
+++ b/.ansible-lint.yml
@@ -0,0 +1,8 @@
+---
+
+skip_list:
+  - 'var-naming'
+  - 'no-handler'
+  - 'role-name'
+  - 'ignore-errors'
+  - 'yaml'
diff --git a/.yamllint b/.yamllint
index 9a9dc42..8c3ba93 100644
--- a/.yamllint
+++ b/.yamllint
@@ -6,4 +6,4 @@ rules:
   truthy:
     allowed-values: ['true', 'false', 'yes', 'no']
   line-length:
-    max: 150
+    max: 160
diff --git a/README.md b/README.md
index 055aa31..4829de8 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,9 @@
 # Ansible Role - Apache2 Webserver
 Ansible Role to deploy one or multiple Apache2 sites on a linux server.
 
+[![Molecule Test Status](https://badges.ansibleguy.net/infra_apache.molecule.svg)](https://molecule.readthedocs.io/en/latest/)
+[![YamlLint Test Status](https://badges.ansibleguy.net/infra_apache.yamllint.svg)](https://yamllint.readthedocs.io/en/stable/)
+[![Ansible-Lint Test Status](https://badges.ansibleguy.net/infra_apache.ansiblelint.svg)](https://ansible-lint.readthedocs.io/en/latest/)
 [![Ansible Galaxy](https://img.shields.io/ansible/role/56803)](https://galaxy.ansible.com/ansibleguy/infra_apache)
 [![Ansible Galaxy Downloads](https://img.shields.io/badge/dynamic/json?color=blueviolet&label=Galaxy%20Downloads&query=%24.download_count&url=https%3A%2F%2Fgalaxy.ansible.com%2Fapi%2Fv1%2Froles%2F56803%2F%3Fformat%3Djson)](https://galaxy.ansible.com/ansibleguy/infra_apache)
 
@@ -59,7 +62,7 @@ Also some basic mods will get a pre-config added. (_prefork, evasive_)
 
 * **Note:** Most of the role's functionality can be opted in or out.
 
-  For all available options - see the default-config located in the main defaults-file!
+  For all available options - see the default-config located in the main/site defaults-file!
 
 
 * **Note:** this role currently only supports debian-based systems
diff --git a/meta/main.yml b/meta/main.yml
index 52180f1..b5670ae 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -3,11 +3,8 @@
 galaxy_info:
   author: 'AnsibleGuy <guy@ansibleguy.net>'
   namespace: 'ansibleguy'
-  readme: 'README.md'
   license: 'GPLv3'
-  repository: 'https://github.com/ansibleguy/infra_apache'
   issue_tracker_url: 'https://github.com/ansibleguy/infra_apache/issues'
-  github_branch: 'stable'
   min_ansible_version: 2.9.10
   description: 'Role to deploy apache2 sites on a linux server'
   platforms: