diff --git a/.ansible-lint b/.ansible-lint
new file mode 100644
index 0000000..5557294
--- /dev/null
+++ b/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '106'
diff --git a/ansible-galaxy-requirements.yml b/ansible-galaxy-requirements.yml
index 98c9fba..9cebffb 100644
--- a/ansible-galaxy-requirements.yml
+++ b/ansible-galaxy-requirements.yml
@@ -19,6 +19,10 @@ collections:
     src: https://galaxy.ansible.com
     version: ">=1.0.0,<2.0.0"
 
+  - name: containers.podman
+    src: https://galaxy.ansible.com
+    version: ">=1.0.0,<2.0.0"
+
   - name: operator_sdk.util
     src: https://galaxy.ansible.com
     version: ">=0.0.0,<1.0.0"
diff --git a/molecule/default/create.yml b/molecule/default/create.yml
index 28946c7..08b1896 100644
--- a/molecule/default/create.yml
+++ b/molecule/default/create.yml
@@ -20,10 +20,20 @@
   become: true
   gather_facts: false
   tasks:
+    - name: prepare directories
+      file:
+        dest: "{{ molecule_ephemeral_directory }}/{{ item.name }}"
+        mode: "0755"
+        state: "directory"
+      loop_control:
+        label: "{{ item.name }}"
+      loop: "{{ molecule_yml.platforms }}"
+      when: item.dockerfile is defined
+
     - name: copy template
       template:
         src: "{{ molecule_scenario_directory }}/{{ item.dockerfile }}"
-        dest: "{{ molecule_ephemeral_directory }}/Dockerfile-{{ item.name }}"
+        dest: "{{ molecule_ephemeral_directory }}/{{ item.name }}/Dockerfile"
         mode: "0644"
       loop_control:
         label: "{{ item.name }}"
@@ -35,8 +45,8 @@
         name: "{{ molecule_ephemeral_directory | regex_replace('^.*/([^/]*/[^/]*)$', '\\1') }}:{{ item.name }}"
         source: "build"
         build:
-          path: "{{ molecule_ephemeral_directory }}"
-          dockerfile: "{{ molecule_ephemeral_directory }}/Dockerfile-{{ item.name }}"
+          path: "{{ molecule_ephemeral_directory }}/{{ item.name }}"
+          pull: true
       loop_control:
         label: "{{ item.name }}"
       loop: "{{ molecule_yml.platforms }}"
@@ -71,6 +81,7 @@
         tty: "{{ item.tty | default(omit) }}"
         volumes: "{{ item.volumes | default(omit) }}"
         env: "{{ item.env | default(omit) }}"
+        container_default_behavior: "no_defaults"
         state: "started"
       loop_control:
         label: "{{ item.name }}"
diff --git a/molecule/default/destroy.yml b/molecule/default/destroy.yml
index 82dc2a5..e8c2531 100644
--- a/molecule/default/destroy.yml
+++ b/molecule/default/destroy.yml
@@ -47,6 +47,7 @@
     - name: docker rm
       docker_container:
         name: "{{ item.name }}"
+        container_default_behavior: "no_defaults"
         state: "absent"
       loop_control:
         label: "{{ item.name }}"
diff --git a/requirements.txt b/requirements.txt
index 74cbbf3..5d61b52 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ansible~=2.10.0a9
-ansible-lint~=4.3.0a6
+ansible-lint~=4.3.1
 ansible-runner
 ansible-runner-http
 argcomplete
diff --git a/roles/catatonit b/roles/catatonit
index 90896e9..0d032e1 160000
--- a/roles/catatonit
+++ b/roles/catatonit
@@ -1 +1 @@
-Subproject commit 90896e9603cbd8df3bc16dacc64431b1064db170
+Subproject commit 0d032e1b1f46627b197b91247daaaf70da653daa
diff --git a/roles/cvs b/roles/cvs
index 89d37f0..4e45c83 160000
--- a/roles/cvs
+++ b/roles/cvs
@@ -1 +1 @@
-Subproject commit 89d37f09eb379a86426230fc3ef7b7f0464a4e57
+Subproject commit 4e45c837b6946ecb795c0bd4d17192f0157a694d
diff --git a/roles/fisheye b/roles/fisheye
index 1c46fa5..cff84fd 160000
--- a/roles/fisheye
+++ b/roles/fisheye
@@ -1 +1 @@
-Subproject commit 1c46fa50d8b2afe9e952747e00c975f3002a01c3
+Subproject commit cff84fd799010fef51f96f06fc0aad3725c7ea1f
diff --git a/roles/git b/roles/git
index fbc8c6b..b0139f0 160000
--- a/roles/git
+++ b/roles/git
@@ -1 +1 @@
-Subproject commit fbc8c6b521a5059a647a7479262a9cae9bea7e43
+Subproject commit b0139f098508be52c21e4d12858010505aabb39f
diff --git a/roles/gosu b/roles/gosu
index b9e4955..ee0715e 160000
--- a/roles/gosu
+++ b/roles/gosu
@@ -1 +1 @@
-Subproject commit b9e4955a57d191b66df373205267d23f4e74b96c
+Subproject commit ee0715ebacb1e4771b9a7c539991815129e3538b
diff --git a/roles/locales b/roles/locales
index 9a4823d..0837db0 160000
--- a/roles/locales
+++ b/roles/locales
@@ -1 +1 @@
-Subproject commit 9a4823db4e9d70d8ec295b225bb0eee248650f5e
+Subproject commit 0837db02bd51290e39f95b376e0618fb598dea42
diff --git a/roles/mercurial b/roles/mercurial
index 5bd7e55..6886683 160000
--- a/roles/mercurial
+++ b/roles/mercurial
@@ -1 +1 @@
-Subproject commit 5bd7e556b0a5f880d470dbb1f618e1d231043c78
+Subproject commit 6886683d15c8e95103dba9f42986660d77adcf66
diff --git a/roles/openjdk b/roles/openjdk
index 842de8a..847a8b3 160000
--- a/roles/openjdk
+++ b/roles/openjdk
@@ -1 +1 @@
-Subproject commit 842de8a626db2038f8961433914d152d5a52f3ea
+Subproject commit 847a8b3eecae3e91572de67d4b83f1089d69757d
diff --git a/roles/perforce b/roles/perforce
index 076e1ef..16c5a97 160000
--- a/roles/perforce
+++ b/roles/perforce
@@ -1 +1 @@
-Subproject commit 076e1ef8600249d801dc2081e8a2b61008006556
+Subproject commit 16c5a97f47f525a763f8c8cd8b8cd8dffa376bc0
diff --git a/roles/python b/roles/python
index 62de7a8..bc8ff2c 160000
--- a/roles/python
+++ b/roles/python
@@ -1 +1 @@
-Subproject commit 62de7a8763b46f2629a8e11a439ac6fc116326a0
+Subproject commit bc8ff2c0e27f96b5a33ce8cdb87c59c335d948fb
diff --git a/roles/svn b/roles/svn
index 83a8eff..1fbb8da 160000
--- a/roles/svn
+++ b/roles/svn
@@ -1 +1 @@
-Subproject commit 83a8eff4a23726c55e818007d3ccee1d684bc451
+Subproject commit 1fbb8da5f382bf424534772650bf7b54a67daf13
diff --git a/roles/timezone b/roles/timezone
index c4d3c09..3fdd5a5 160000
--- a/roles/timezone
+++ b/roles/timezone
@@ -1 +1 @@
-Subproject commit c4d3c09f843608ff0f902161229ed3aa5c33f74b
+Subproject commit 3fdd5a5ec06760779ab9250f1698a993db400736
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
index 320c892..f929b00 100755
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@@ -41,3 +41,6 @@ curl -skL https://bootstrap.pypa.io/get-pip.py | python3 - --prefix=/usr/local
 
 # Install PIP dependencies
 pip3 install --prefix=/usr/local --upgrade --ignore-installed --requirement requirements.txt
+
+# Install Ansible Collection dependencies
+ansible-galaxy collection install --force --requirements-file ansible-galaxy-requirements.yml
diff --git a/scripts/bootstrap-vagrant.sh b/scripts/bootstrap-vagrant.sh
index 1c7fe65..a893859 100755
--- a/scripts/bootstrap-vagrant.sh
+++ b/scripts/bootstrap-vagrant.sh
@@ -22,27 +22,27 @@ cd "$(cd "$(dirname "$0")"; pwd -P)/../"
 if [ -x "$(command -v apt-get)" ]; then
     apt-get update
     apt-get install -y binutils bridge-utils dnsmasq-base ebtables libvirt-clients libvirt-daemon-system libvirt-dev make qemu-kvm qemu-utils ruby-dev
-    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.deb
-    dpkg -i vagrant_2.2.9_x86_64.deb
-    rm -rf vagrant_2.2.9_*
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.deb
+    dpkg -i vagrant_2.2.10_x86_64.deb
+    rm -rf vagrant_2.2.10_*
 fi
 
 # Prepare YUM dependencies
 if [ -x "$(command -v yum)" ]; then
     yum makecache
     yum install -y binutils dnsmasq ebtables libvirt libvirt-client libvirt-devel make qemu-img qemu-kvm ruby-devel virt-install
-    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.rpm
-    yum localinstall vagrant_2.2.9_x86_64.rpm
-    rm -rf vagrant_2.2.9_*
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.rpm
+    yum localinstall vagrant_2.2.10_x86_64.rpm
+    rm -rf vagrant_2.2.10_*
 fi
 
 # Prepare Zypper dependencies
 if [ -x "$(command -v zypper)" ]; then
     zypper -n --gpg-auto-import-keys refresh
     zypper -n install -y binutils-gold bridge-utils dnsmasq ebtables libvirt libvirt-client libvirt-devel make qemu-kvm qemu-tools ruby-devel virt-install
-    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.rpm
-    zypper install vagrant_2.2.9_x86_64.rpm
-    rm -rf vagrant_2.2.9_*
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.rpm
+    zypper install vagrant_2.2.10_x86_64.rpm
+    rm -rf vagrant_2.2.10_*
 fi
 
 # Install vagrant-libvirt