diff --git a/.buildah.metadata b/.buildah.metadata
index d9cc732..6d09bbe 100644
--- a/.buildah.metadata
+++ b/.buildah.metadata
@@ -1 +1 @@
-355ae0762c4297e16a575211827f6cdc97983249 SOURCES/v1.22.3.tar.gz
+f7aaa151b2f00ce3a1e437704765e23df61446d1 SOURCES/release-1.22-4d20222.tar.gz
diff --git a/.gitignore b/.gitignore
index 1dc2479..0c033e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v1.22.3.tar.gz
+SOURCES/release-1.22-4d20222.tar.gz
diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec
index 9864ab1..1641c76 100644
--- a/SPECS/buildah.spec
+++ b/SPECS/buildah.spec
@@ -11,24 +11,23 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 %endif
 
 %global import_path github.com/containers/buildah
-#%%global branch release-1.22
-#%%global commit0 98960f20299ffad367603f1fbd87054f7862a97f
-#%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
+%global branch release-1.22
+%global commit0 4d2022278696ad2f39b5c95029d8c699db404f37
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name: buildah
 Version: 1.22.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
 # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
 ExclusiveArch: %{go_arches}
-#%%if 0%%{?branch:1}
-#Source0: https://%%{import_path}/tarball/%%{commit0}/%%{branch}-%%{shortcommit0}.tar.gz
-#%%else
-#Source0: https://%%{import_path}/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz
-#%%endif
-Source0: https://%{import_path}/archive/v%{version}.tar.gz
+%if 0%{?branch:1}
+Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
+%else
+Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%%{shortcommit0}.tar.gz
+%endif
 BuildRequires: golang >= 1.16.6
 BuildRequires: git
 BuildRequires: glib2-devel
@@ -41,7 +40,7 @@ BuildRequires: device-mapper-devel
 BuildRequires: libassuan-devel
 BuildRequires: make
 Requires: runc >= 1.0.0-26
-Requires: containers-common
+Requires: containers-common >= 2:1-2
 Recommends: container-selinux
 Requires: slirp4netns >= 0.3-0
 
@@ -71,12 +70,11 @@ Requires: nmap-ncat
 This package contains system tests for %{name}
 
 %prep
-#%%if 0%{?branch:1}
-#%%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
-#%%else
-#%%autosetup -Sgit -n %{name}-%{commit0}
-#%%endif
-%autosetup -Sgit -n %{name}-%{version}
+%if 0%{?branch:1}
+%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+%else
+%autosetup -Sgit -n %%{name}-%{commit0}
+%endif
 sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
 sed -i '/docs install/d' Makefile
 
@@ -129,6 +127,11 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Wed Aug 25 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.3-2
+- update to the latest content of https://github.com/containers/buildah/tree/release-1.22
+  (https://github.com/containers/buildah/commit/4d20222)
+- Related: #1934415
+
 * Fri Aug 20 2021 Lokesh Mandvekar <lsm5@redhat.com> - 1.22.3-1
 - update to v1.22.3
 - Related: #1934415