diff --git a/_service b/_service
index 222e700..5f03dea 100644
--- a/_service
+++ b/_service
@@ -1,40 +1,38 @@
-
-
-https://github.com/containers/storage.git
-git
-storage
-1.28.1
-v1.28.1
-
-
-
-https://github.com/containers/image.git
-git
-image
-5.10.5
-v5.10.5
-
-
-
-https://github.com/containers/podman.git
-git
-podman
-3.1.0
-v3.1.0
-
-
-
-https://github.com/containers/common.git
-git
-common
-0.35.3
-v0.35.3
-
-
-
-*.tar
-xz
-
-
+
+ https://github.com/containers/storage.git
+ git
+ storage
+ v1.29.0
+ @PARENT_TAG@
+ v(.*)
+
+
+ https://github.com/containers/image.git
+ git
+ image
+ v5.11.0
+ @PARENT_TAG@
+ v(.*)
+
+
+ https://github.com/containers/podman.git
+ git
+ podman
+ v3.1.1
+ @PARENT_TAG@
+ v(.*)
+
+
+ https://github.com/containers/common.git
+ git
+ common
+ v0.36.0
+ @PARENT_TAG@
+ v(.*)
+
+
+ *.tar
+ xz
+
diff --git a/common-0.35.3.tar.xz b/common-0.35.3.tar.xz
deleted file mode 100644
index 7e8c958..0000000
--- a/common-0.35.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c60d202ee9f93b8dcc5718b36dac1fbe9aee9eff9dc536933037001651898c91
-size 2198904
diff --git a/common-0.36.0.tar.xz b/common-0.36.0.tar.xz
new file mode 100644
index 0000000..3d926c4
--- /dev/null
+++ b/common-0.36.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59e62dbc92aebe018fdcc7f353d2036c15fc6e288ae8fd6c3b7e30b3a7b24ff1
+size 2185508
diff --git a/image-5.10.5.tar.xz b/image-5.10.5.tar.xz
deleted file mode 100644
index cbdedad..0000000
--- a/image-5.10.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e5c996853ec03725fb98475e15f83b2683bc0869cadd25bfe1cecc69f8e2baa
-size 332720
diff --git a/image-5.11.0.tar.xz b/image-5.11.0.tar.xz
new file mode 100644
index 0000000..4e83222
--- /dev/null
+++ b/image-5.11.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:795678a27ec071f766c19953c004a0f73ba994d9e373b3a5ba5e2aea0e3d897e
+size 362912
diff --git a/libcontainers-common.changes b/libcontainers-common.changes
index 5ccd995..6219ab0 100644
--- a/libcontainers-common.changes
+++ b/libcontainers-common.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Apr 19 12:21:56 UTC 2021 - Richard Brown
+
+- Force overlay as default storage driver if system is not btrfs
+ (gh#containers/buildah#3153)
+
+-------------------------------------------------------------------
+Mon Apr 19 11:03:30 UTC 2021 - Alexandre Vicenzi
+
+- Update common to 0.36.0
+- Update podman to 3.1.1
+- Update storage to 1.29.0
+- Update image to 5.11.0
+
-------------------------------------------------------------------
Tue Mar 30 08:37:09 UTC 2021 - Alexandre Vicenzi
diff --git a/libcontainers-common.spec b/libcontainers-common.spec
index 6605ef9..4105d90 100644
--- a/libcontainers-common.spec
+++ b/libcontainers-common.spec
@@ -17,16 +17,16 @@
# commonver - version from containers/common
-%define commonver 0.35.3
+%define commonver 0.36.0
# podman - version from containers/podman
-%define podmanver 3.1.0
+%define podmanver 3.1.1
# storagever - version from containers/storage
-%define storagever 1.28.1
+%define storagever 1.29.0
# imagever - version from containers/image
-%define imagever 5.10.5
+%define imagever 5.11.0
Name: libcontainers-common
Version: 20210112
@@ -138,7 +138,7 @@ install -D -m 0644 common-%{commonver}/docs/containers.conf.5 %{buildroot}/%{_ma
if [ $1 -eq 1 ] ; then
fstype=$((findmnt -o FSTYPE -l --target /var/lib/containers || findmnt -o FSTYPE -l --target /var/lib) | grep -v FSTYPE)
if [ "$fstype" = "btrfs" ]; then
- sed -i 's/driver = ""/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf
+ sed -i 's/driver = "overlay"/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf
fi
fi
diff --git a/podman-3.1.0.tar.xz b/podman-3.1.0.tar.xz
deleted file mode 100644
index 53d8aeb..0000000
--- a/podman-3.1.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7fa42ff76f1eba6ac499134c0d3f1c3f6c9b240abffe7df2467382b6dca6c324
-size 6052000
diff --git a/podman-3.1.1.tar.xz b/podman-3.1.1.tar.xz
new file mode 100644
index 0000000..600c092
--- /dev/null
+++ b/podman-3.1.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2047b10504bb2b67e17d451e1906a0977f93e7d76b9a8683d91f5c239cc2dd4
+size 6093796
diff --git a/storage-1.28.1.tar.xz b/storage-1.28.1.tar.xz
deleted file mode 100644
index 6ceae1a..0000000
--- a/storage-1.28.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ffb25a01fe5b2f37f533b1a16f2d938635e7ccb778ab6fd738d1d830f27a7cdd
-size 1680928
diff --git a/storage-1.29.0.tar.xz b/storage-1.29.0.tar.xz
new file mode 100644
index 0000000..b5ed2be
--- /dev/null
+++ b/storage-1.29.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf0c0d25b070d30937d656ecacc7a0572759d45b2e2544e832d401be8391cc55
+size 1749644
diff --git a/storage.conf b/storage.conf
index 403aec6..5433b66 100644
--- a/storage.conf
+++ b/storage.conf
@@ -5,7 +5,7 @@
[storage]
# Default Storage Driver
-driver = ""
+driver = "overlay"
# Temporary storage location
runroot = "/var/run/containers/storage"