diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index f36b4e458..d4b11bd55 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -21,10 +21,7 @@ add-apt-repository \
 
 . /etc/lsb-release
 
-# overlayfs with current Ubuntu kernel breaks CRIU
-# https://bugs.launchpad.net/ubuntu/+source/linux-azure/+bug/1967924
-# Use devicemapper storage drive as a work-around
-echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json
+echo '{ "experimental": true }' > /etc/docker/daemon.json
 
 CRIU_LOG='/criu.log'
 mkdir -p /etc/criu
diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index 414004514..973d2d722 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -25,11 +25,7 @@ make install
 popd
 rm -rf "${tmp_dir}"
 
-# overlayfs with current Ubuntu kernel breaks CRIU
-# https://bugs.launchpad.net/ubuntu/+source/linux-azure/+bug/1967924
-# Use VFS storage drive as a work-around
-export STORAGE_DRIVER=vfs
-podman --storage-driver vfs info
+podman info
 
 # shellcheck disable=SC2016
 podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'