diff --git a/README.md b/README.md
index 262251073c74b6798ed67447420edd96f3381b67..12f34efbd926f88887df4a41b6e0efa65b5419f4 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Deploy prometheus [node exporter](https://github.com/prometheus/node_exporter) u
 
 ## Requirements
 
-- Ansible >= 2.6 (It might work on previous versions, but we cannot guarantee it)
+- Ansible >= 2.7 (It might work on previous versions, but we cannot guarantee it)
 - gnu-tar on Mac deployer host (`brew install gnu-tar`)
 
 ## Role Variables
diff --git a/molecule/alternative/molecule.yml b/molecule/alternative/molecule.yml
index 2cac832b4f652cbcde26013b8f3946c41545750e..22a7ccbd538103b1fab35f6061b18be7b25d0722 100644
--- a/molecule/alternative/molecule.yml
+++ b/molecule/alternative/molecule.yml
@@ -7,37 +7,37 @@ lint:
   name: yamllint
 platforms:
   - name: bionic
-    image: paulfantom/ubuntu-molecule:18.04
+    image: quay.io/paulfantom/molecule-systemd:ubuntu-18.04
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: xenial
-    image: paulfantom/ubuntu-molecule:16.04
+    image: quay.io/paulfantom/molecule-systemd:ubuntu-16.04
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: stretch
-    image: paulfantom/debian-molecule:9
+    image: quay.io/paulfantom/molecule-systemd:debian-9
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: buster
-    image: paulfantom/debian-molecule:10
+    image: quay.io/paulfantom/molecule-systemd:debian-10
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: centos7
-    image: paulfantom/centos-molecule:7
+    image: quay.io/paulfantom/molecule-systemd:centos-7
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: centos8
-    image: paulfantom/centos-molecule:8
+    image: quay.io/paulfantom/molecule-systemd:centos-8
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
@@ -45,7 +45,7 @@ platforms:
     groups:
       - python3
   - name: fedora
-    image: paulfantom/fedora-molecule:30
+    image: quay.io/paulfantom/molecule-systemd:fedora-30
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index da65dceac0fb586197c098499bdef375c08627f3..619be2b9b36403318299b3cc318e4f309eeafe91 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -7,37 +7,37 @@ lint:
   name: yamllint
 platforms:
   - name: bionic
-    image: paulfantom/ubuntu-molecule:18.04
+    image: quay.io/paulfantom/molecule-systemd:ubuntu-18.04
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: xenial
-    image: paulfantom/ubuntu-molecule:16.04
+    image: quay.io/paulfantom/molecule-systemd:ubuntu-16.04
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: stretch
-    image: paulfantom/debian-molecule:9
+    image: quay.io/paulfantom/molecule-systemd:debian-9
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: buster
-    image: paulfantom/debian-molecule:10
+    image: quay.io/paulfantom/molecule-systemd:debian-10
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: centos7
-    image: paulfantom/centos-molecule:7
+    image: quay.io/paulfantom/molecule-systemd:centos-7
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: centos8
-    image: paulfantom/centos-molecule:8
+    image: quay.io/paulfantom/molecule-systemd:centos-8
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
@@ -45,7 +45,7 @@ platforms:
     groups:
       - python3
   - name: fedora
-    image: paulfantom/fedora-molecule:30
+    image: quay.io/paulfantom/molecule-systemd:fedora-30
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
diff --git a/molecule/latest/molecule.yml b/molecule/latest/molecule.yml
index 7816e2f806a8f69682b521ed993c2f88eb469008..50522211b10fd04bb232f46aeaeff8435793c5f6 100644
--- a/molecule/latest/molecule.yml
+++ b/molecule/latest/molecule.yml
@@ -7,13 +7,13 @@ lint:
   name: yamllint
 platforms:
   - name: buster
-    image: paulfantom/debian-molecule:10
+    image: quay.io/paulfantom/molecule-systemd:debian-10
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: fedora
-    image: paulfantom/fedora-molecule:30
+    image: quay.io/paulfantom/molecule-systemd:fedora-30
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     privileged: true
     volumes: