diff --git a/libcontainers-common.changes b/libcontainers-common.changes
index 6e42b5b..40e262b 100644
--- a/libcontainers-common.changes
+++ b/libcontainers-common.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jan 13 06:01:46 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
+
+- storage.conf: Unset 'driver' and set 'driver_priority' to
+  allow podman to use 'btrfs' if available and fallback to
+  'overlay' if not.
+- .spec: rm %post script to set 'btrfs' as storage driver
+  in storage.conf
+
 -------------------------------------------------------------------
 Mon Dec  5 12:23:07 UTC 2022 - Dan Čermák <dcermak@suse.com>
 
diff --git a/libcontainers-common.spec b/libcontainers-common.spec
index 245c95b..361518b 100644
--- a/libcontainers-common.spec
+++ b/libcontainers-common.spec
@@ -140,17 +140,6 @@ install -D -m 0644 common-%{commonver}/docs/containers.conf.5 %{buildroot}/%{_ma
 %post
 # Comment out ostree_repo if it's blank [boo#1189893]
 sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/storage.conf
-# use btrfs storage driver if system storage is on btrfs
-# For rootless it will fall back to overlay if btrfs is not working
-# https://github.com/containers/storage/blob/main/docs/containers-storage.conf.5.md#storage-table
-if [ $1 -eq 1 ] ; then
-  for dir in %{_localstatedir}/lib/containers %{_localstatedir}/lib ; do
-    test "$(findmnt -o FSTYPE -l --target '$dir' | grep -v FSTYPE)" != "btrfs" && CONTAINERS_USE_BTRFS_DRIVER=0
-  done
-  if [ "$CONTAINERS_USE_BTRFS_DRIVER" != "0" ]; then
-    sed -i 's/driver = "overlay"/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf
-  fi
-fi
 
 %files
 %dir %{_sysconfdir}/containers
diff --git a/storage.conf b/storage.conf
index 1c51771..54023c6 100644
--- a/storage.conf
+++ b/storage.conf
@@ -14,11 +14,15 @@
 [storage]
 
 # Default Storage Driver, Must be set for proper operation.
-driver = "overlay"
+# driver = "overlay"
 
 # Temporary storage location
 runroot = "/run/containers/storage"
 
+# Priority list for the storage drivers that will be tested one
+# after the other to pick the storage driver if it is not defined.
+driver_priority = ["btrfs", "overlay"]
+
 # Primary Read/Write location of container storage
 # When changing the graphroot location on an SELINUX system, you must
 # ensure  the labeling matches the default locations labels with the