diff --git a/.yamllint.yml b/.yamllint.yml
index ff1c9ec4..aabc6f66 100644
--- a/.yamllint.yml
+++ b/.yamllint.yml
@@ -12,5 +12,11 @@ ignore: |
 rules:
   line-length:
     max: 120
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
 
   truthy: disable
diff --git a/ansible/roles/github_cli/.yamllint b/ansible/roles/github_cli/.yamllint
deleted file mode 100644
index ad0be760..00000000
--- a/ansible/roles/github_cli/.yamllint
+++ /dev/null
@@ -1,11 +0,0 @@
-extends: default
-
-rules:
-  braces:
-    max-spaces-inside: 1
-    level: error
-  brackets:
-    max-spaces-inside: 1
-    level: error
-  line-length: disable
-  truthy: disable
diff --git a/ansible/roles/github_cli/molecule/default/molecule.yml b/ansible/roles/github_cli/molecule/default/molecule.yml
index 1ef09da3..f5bbe2a6 100644
--- a/ansible/roles/github_cli/molecule/default/molecule.yml
+++ b/ansible/roles/github_cli/molecule/default/molecule.yml
@@ -3,15 +3,11 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: instance
     image: ubuntu:latest
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
 verifier:
   name: testinfra
   lint:
diff --git a/ansible/roles/i3/.yamllint b/ansible/roles/i3/.yamllint
deleted file mode 100644
index ad0be760..00000000
--- a/ansible/roles/i3/.yamllint
+++ /dev/null
@@ -1,11 +0,0 @@
-extends: default
-
-rules:
-  braces:
-    max-spaces-inside: 1
-    level: error
-  brackets:
-    max-spaces-inside: 1
-    level: error
-  line-length: disable
-  truthy: disable
diff --git a/ansible/roles/i3/molecule/default/molecule.yml b/ansible/roles/i3/molecule/default/molecule.yml
index 1ef09da3..f5bbe2a6 100644
--- a/ansible/roles/i3/molecule/default/molecule.yml
+++ b/ansible/roles/i3/molecule/default/molecule.yml
@@ -3,15 +3,11 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: instance
     image: ubuntu:latest
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
 verifier:
   name: testinfra
   lint:
diff --git a/ansible/roles/markdown_mimetype/.yamllint b/ansible/roles/markdown_mimetype/.yamllint
deleted file mode 100644
index ad0be760..00000000
--- a/ansible/roles/markdown_mimetype/.yamllint
+++ /dev/null
@@ -1,11 +0,0 @@
-extends: default
-
-rules:
-  braces:
-    max-spaces-inside: 1
-    level: error
-  brackets:
-    max-spaces-inside: 1
-    level: error
-  line-length: disable
-  truthy: disable
diff --git a/ansible/roles/markdown_mimetype/molecule/default/molecule.yml b/ansible/roles/markdown_mimetype/molecule/default/molecule.yml
index 1ef09da3..f5bbe2a6 100644
--- a/ansible/roles/markdown_mimetype/molecule/default/molecule.yml
+++ b/ansible/roles/markdown_mimetype/molecule/default/molecule.yml
@@ -3,15 +3,11 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: instance
     image: ubuntu:latest
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
 verifier:
   name: testinfra
   lint:
diff --git a/ansible/roles/rust/.yamllint b/ansible/roles/rust/.yamllint
deleted file mode 100644
index ad0be760..00000000
--- a/ansible/roles/rust/.yamllint
+++ /dev/null
@@ -1,11 +0,0 @@
-extends: default
-
-rules:
-  braces:
-    max-spaces-inside: 1
-    level: error
-  brackets:
-    max-spaces-inside: 1
-    level: error
-  line-length: disable
-  truthy: disable
diff --git a/ansible/roles/rust/molecule/default/molecule.yml b/ansible/roles/rust/molecule/default/molecule.yml
index 1ef09da3..f5bbe2a6 100644
--- a/ansible/roles/rust/molecule/default/molecule.yml
+++ b/ansible/roles/rust/molecule/default/molecule.yml
@@ -3,15 +3,11 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
 platforms:
   - name: instance
     image: ubuntu:latest
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
 verifier:
   name: testinfra
   lint:
diff --git a/requirements.txt b/requirements.txt
index 0269b23b..815e078a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,7 @@
-molecule==2.20.1
+molecule==3.0.8
+pytest-testinfra==6.4.0
 ansible==2.10.7
+ansible-lint==5.2.1
 docker==5.0.3
 jmespath==0.10.0
 vim-vint==0.3.21
diff --git a/test/ansible b/test/ansible
index 01ade5e1..583a1c01 100755
--- a/test/ansible
+++ b/test/ansible
@@ -4,3 +4,8 @@ set -x
 
 ansible-galaxy role install -r ansible/requirements.yml --force
 ansible-playbook ansible/playbooks/*.yml --syntax-check
+ansible-lint -p ansible/playbooks/*.yml
+ansible-lint -p ansible/roles/github_cli
+ansible-lint -p ansible/roles/rust
+ansible-lint -p ansible/roles/i3
+ansible-lint -p ansible/roles/markdown_mimetype