diff --git a/.woodpecker.yml b/.woodpecker.yml
index b68b652..e27fde1 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,7 +1,6 @@
 matrix:
   MOLECULE_DISTRO: 
     - centos7
-    - centos8
     - almalinux8
     
 steps:
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 8218f95..6b9827e 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -4,8 +4,8 @@ dependency:
 driver:
   name: docker
 platforms:
-  - name: instance-${MOLECULE_DISTRO:-centos8}
-    image: docker.io/guisea/${MOLECULE_DISTRO:-centos8}:latest
+  - name: instance-${MOLECULE_DISTRO:-centos7}
+    image: docker.io/guisea/${MOLECULE_DISTRO:-centos7}:latest
     pre_build_image: true
 role_name_check: 2
 provisioner:
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index 5c30ff9..666a4bb 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -5,15 +5,16 @@
   hosts: all
   tasks:
   - name: Retrieve yum repofile
-    shell: cat /etc/yum.repos.d/epel.repo
+    ansible.builtin.shell: cat /etc/yum.repos.d/epel.repo
     ignore_errors: true
     register: repofile
 
-  - debug:
+  - name: Output repofile
+    ansible.builtin.debug:
       var: repofile
   
-  - name: metalink is present
-    assert:
+  - name: Metalink is present
+    ansible.builtin.assert:
       that:
         - "'metalink=' in repofile.stdout"
 
@@ -22,15 +23,15 @@
   #     that:
   #       - "'baseurl=' not in repofile.stdout"
 
-  - name: try to install htop from EPEL
-    package:
+  - name: Try to install htop from EPEL
+    ansible.builtin.package:
       name: htop
-      state: latest
+      state: installed
     
   - name: Gather the rpm package facts
-    package_facts:
+    ansible.builtin.package_facts:
       manager: auto
     
-  - name: is htop actually installed?
-    assert:
+  - name: Is htop actually installed?
+    ansible.builtin.assert:
       that: "'htop' in ansible_facts.packages"
diff --git a/molecule/mirror-is-set/molecule.yml b/molecule/mirror-is-set/molecule.yml
index 8667f5f..85ec9fd 100644
--- a/molecule/mirror-is-set/molecule.yml
+++ b/molecule/mirror-is-set/molecule.yml
@@ -4,8 +4,8 @@ dependency:
 driver:
   name: docker
 platforms:
-  - name: instance-${MOLECULE_DISTRO:-centos8}
-    image: docker.io/guisea/${MOLECULE_DISTRO:-centos8}:latest
+  - name: instance-${MOLECULE_DISTRO:-centos7}
+    image: docker.io/guisea/${MOLECULE_DISTRO:-centos7}:latest
     pre_build_image: true
 provisioner:
   name: ansible