diff --git a/fedora.template b/fedora.template
index 907798c..fdf8c8c 100644
--- a/fedora.template
+++ b/fedora.template
@@ -48,6 +48,10 @@ nfs-utils
 go-hvkvp
 python-setuptools
 dnsmasq
+podman
+buildah
+skopeo
+cri-o
 
 #Packages to be removed
 -aic94xx-firmware
diff --git a/scripts/handle-user-data b/scripts/handle-user-data
index 3cf207b..43f39b9 100755
--- a/scripts/handle-user-data
+++ b/scripts/handle-user-data
@@ -43,10 +43,27 @@ mount_partitions() {
     mount --bind /mnt/$PARTNAME/var/lib/docker /var/lib/docker
     restorecon -R /var/lib/docker
 
+    mkdir -p /mnt/$PARTNAME/var/lib/containers
+    mkdir -p /var/lib/containers
+    mount --bind /mnt/$PARTNAME/var/lib/containers /var/lib/containers
+    restorecon -R /var/lib/containers
+
     mkdir -p /mnt/$PARTNAME/var/lib/boot2docker
     mkdir -p /var/lib/boot2docker
     mount --bind /mnt/$PARTNAME/var/lib/boot2docker /var/lib/boot2docker
 
+    mkdir -p /mnt/$PARTNAME/var/lib/boot2docker/etc/docker
+    cp -r /etc/docker/* /mnt/$PARTNAME/var/lib/boot2docker/etc/docker
+    rm -rf /etc/docker
+    mkdir -p /etc/docker
+    mount --bind /mnt/$PARTNAME/var/lib/boot2docker/etc/docker /etc/docker
+
+    mkdir -p /mnt/$PARTNAME/etc/containers
+    cp -r /etc/containers/* /mnt/$PARTNAME/etc/containers
+    rm -rf /etc/containers
+    mkdir -p /etc/containers
+    mount --bind /mnt/$PARTNAME/etc/containers /etc/containers
+
     mkdir -p /mnt/$PARTNAME/var/lib/minishift
     mkdir -p /var/lib/minishift
     mount --bind /mnt/$PARTNAME/var/lib/minishift /var/lib/minishift
diff --git a/tests/test.sh b/tests/test.sh
index 0b8c6e8..80e4b61 100644
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -102,7 +102,7 @@ function verify_sshfs_installation() {
 }
 
 function verify_nfs_installation() {
-  expected="mount.nfs: (linux nfs-utils 2.3.2)"
+  expected="mount.nfs: (linux nfs-utils 2.3.3)"
   output=`$BINARY ssh -- sudo /sbin/mount.nfs -V /need/for/version`
   assert_equal "$output" "$expected"
   print_success_message "NFS installation"
@@ -110,7 +110,7 @@ function verify_nfs_installation() {
 
 function verify_bind_mount() {
   output=`$BINARY ssh -- 'findmnt | grep "\[/var/lib/" | wc -l'`
-  assert_equal $output "8"
+  assert_equal $output "11"
   print_success_message "Bind mount check"
 }