diff --git a/.travis.yml b/.travis.yml
index e054a15..bfc3b38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,12 +24,6 @@ before_install:
 install:
   - curl https://gist.githubusercontent.com/030/fa2454b56c525286b39d549583173d8e/raw/c9f9cf439339819958e13cad1d5b5f719217d427/ansible-ci-requirements.sh | sudo bash  # yamllint disable-line rule:line-length
 
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-$ROLE_NAME $ORG_NAME.$ROLE_NAME
-  - cd $ORG_NAME.$ROLE_NAME
-
 script:
   - molecule test
 
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 4e0ea2f..87daaf0 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -3,5 +3,8 @@
   hosts: all
   become: true
 
+  vars:
+    nodejs_install_npm_user: root
+
   roles:
-    - role: verdaccio.verdaccio
+    - role: ansible-verdaccio
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index b5710a8..b92f159 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -5,9 +5,21 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: docker.io/pycontribs/centos:8
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
     pre_build_image: true
 provisioner:
   name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
+scenario:
+  name: default
 verifier:
-  name: ansible
+  name: testinfra
+  lint:
+    name: flake8