diff --git a/centos-7.template b/centos-7.template
index 7e6a0da..39dbe6e 100644
--- a/centos-7.template
+++ b/centos-7.template
@@ -22,6 +22,8 @@ repo --name=updates --baseurl=http://mirror.centos.org/centos/7/updates/x86_64/
 repo --name=extras --baseurl=http://mirror.centos.org/centos/7/extras/x86_64/
 repo --name=atomic --baseurl=http://mirror.centos.org/centos/7/atomic/x86_64/adb/
 repo --name=hvkvp --baseurl=https://copr-be.cloud.fedoraproject.org/results/gbraad/go-hvkvp/epel-7-x86_64/
+repo --name=virt7-container-common-candidate --baseurl=https://cbs.centos.org/repos/virt7-container-common-candidate/x86_64/os/
+repo --name=paas7-openshift-origin39-candidate --baseurl=https://cbs.centos.org/repos/paas7-openshift-origin39-candidate/x86_64/os/
 
 shutdown
 
@@ -51,6 +53,10 @@ python-setuptools
 dnsmasq
 subscription-manager-rhsm-certificates
 httpd-tools
+cri-o
+podman
+buildah
+skopeo
 
 #Packages to be removed
 -aic94xx-firmware
diff --git a/scripts/handle-user-data b/scripts/handle-user-data
index 180db54..43f39b9 100755
--- a/scripts/handle-user-data
+++ b/scripts/handle-user-data
@@ -43,6 +43,11 @@ 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
@@ -53,6 +58,12 @@ mount_partitions() {
     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 b1d7bcd..9725a01 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -110,7 +110,7 @@ function verify_nfs_installation() {
 
 function verify_bind_mount() {
   output=`$BINARY ssh -- 'findmnt | grep "\[/var/lib/" | wc -l'`
-  assert_equal $output "9"
+  assert_equal $output "11"
   print_success_message "Bind mount check"
 }