diff --git a/.ansible-lint.yml b/.ansible-lint.yml
new file mode 100644
index 0000000..7c0a7ab
--- /dev/null
+++ b/.ansible-lint.yml
@@ -0,0 +1,6 @@
+---
+
+skip_list:
+  - 'var-naming'
+  - 'no-handler'
+  - 'role-name'
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..8c3ba93
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,9 @@
+---
+
+extends: default
+
+rules:
+  truthy:
+    allowed-values: ['true', 'false', 'yes', 'no']
+  line-length:
+    max: 160
diff --git a/README.md b/README.md
index 7a85d5d..aa12c24 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,9 @@ Ansible Role to deploy a ZoneMinder IP-CAM server.
 
 Read into the [official documentation](https://zoneminder.readthedocs.io/en/stable/userguide/gettingstarted.html) on how to add ip-cams and so on.
 
+[![Molecule Test Status](https://badges.ansibleguy/sw_zoneminder.molecule.svg)]()
+[![YamlLint Test Status](https://badges.ansibleguy/sw_zoneminder.yamllint.svg)]()
+[![Ansible-Lint Test Status](https://badges.ansibleguy/sw_zoneminder.ansiblelint.svg)]()
 [![Ansible Galaxy](https://img.shields.io/ansible/role/59996)](https://galaxy.ansible.com/ansibleguy/sw_zoneminder)
 [![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%2F59996%2F%3Fformat%3Djson)](https://galaxy.ansible.com/ansibleguy/sw_zoneminder)
 
diff --git a/meta/main.yml b/meta/main.yml
index ad3b45e..be2d0f2 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/sw_zoneminder'
   issue_tracker_url: 'https://github.com/ansibleguy/sw_zoneminder/issues'
-  github_branch: 'stable'
   min_ansible_version: 2.9.10
   description: 'Role to provision Zoneminder IP-CAM Servers'
   platforms:
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index de868c8..23b5621 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -43,20 +43,15 @@ provisioner:
   name: ansible
 verifier:
   name: ansible
-lint:
-  name: yamllint
 scenario:
   name: default
   test_sequence:
     - lint
     - destroy
-#    - dependency
     - syntax
     - create
-#    - prepare
     - converge
     - idempotence
     - check
-#    - side_effect
     - verify
     - destroy
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index 37147a9..c5f689c 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -42,10 +42,10 @@
   hosts: grp_tester
   gather_facts: false
   tasks:
-  - name: Checking if zoneminder web-service is reachable
-    ansible.builtin.uri:
-      url: 'https://zoneminder.test.ansibleguy.net'
-      return_content: yes
-      validate_certs: false
-    register: page
-    failed_when: "'Zoneminder' not in page.content"
+    - name: Checking if zoneminder web-service is reachable
+      ansible.builtin.uri:
+        url: 'https://zoneminder.test.ansibleguy.net'
+        return_content: yes
+        validate_certs: false
+      register: page
+      failed_when: "'Zoneminder' not in page.content"
diff --git a/requirements.yml b/requirements.yml
index 405ead1..34a167d 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -11,4 +11,4 @@ collections:
 roles:
   - src: 'ansibleguy.infra_apache'
   - src: 'ansibleguy.infra_certs'
-  - src: 'ansibleguy.infra_mariadb'
\ No newline at end of file
+  - src: 'ansibleguy.infra_mariadb'
diff --git a/tasks/debian/web.yml b/tasks/debian/web.yml
index 010bb25..b27fb09 100644
--- a/tasks/debian/web.yml
+++ b/tasks/debian/web.yml
@@ -29,7 +29,9 @@
   when: ZM_CONFIG.timezone not in NONE_VALUES
 
 - name: ZoneMinder | Debian | Webserver | Getting local timezone
-  ansible.builtin.shell: "timedatectl | grep 'Time zone' | cut -d':' -f2 | cut -d' ' -f2"
+  ansible.builtin.shell: |
+    set -o pipefail
+    timedatectl | grep 'Time zone' | cut -d':' -f2 | cut -d' ' -f2
   register: controller_tz
   delegate_to: localhost
   changed_when: false