diff --git a/.gitignore b/.gitignore
index 62d8004..9ddc903 100644
--- a/.gitignore
+++ b/.gitignore
@@ -505,3 +505,4 @@
 /v1.21.2.tar.gz
 /buildah-ec35bc4.tar.gz
 /v1.21.3.tar.gz
+/v1.21.4.tar.gz
diff --git a/buildah.spec b/buildah.spec
index 574311d..cc50591 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -25,20 +25,20 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 # To build random commit
-%global commit0 baba8de3ddad18bb6eb7abd6d17972c8403f8f25
+#%%global commit0 baba8de3ddad18bb6eb7abd6d17972c8403f8f25
 
-%global built_tag v1.21.3
+%global built_tag v1.21.4
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 
 Name: %{repo}
-Version: 1.21.3
+Version: 1.21.4
 Release: 3%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
-#Source0: %%{git0}/archive/%%{built_tag}.tar.gz
+Source0: %{git0}/archive/%{built_tag}.tar.gz
 # To build random commit
-Source0: %{git0}/archive/%{commit0}.tar.gz
+#Source0: %%{git0}/archive/%%{commit0}.tar.gz
 BuildRequires: device-mapper-devel
 BuildRequires: golang
 BuildRequires: git
@@ -97,8 +97,8 @@ Requires: nmap-ncat
 This package contains system tests for %{name}
 
 %prep
-#%%autosetup -Sgit -n %%{name}-%%{built_tag_strip}
-%autosetup -Sgit -n %{name}-%{commit0}
+%autosetup -Sgit -n %{name}-%{built_tag_strip}
+#%%autosetup -Sgit -n %%{name}-%%{commit0}
 sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
 sed -i '/docs install/d' Makefile
 
@@ -157,6 +157,10 @@ cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
 %{_datadir}/%{name}/test
 
 %changelog
+* Fri Jul 23 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.21.4-1
+- bump to v1.21.4
+- fix gating test issues
+
 * Thu Jul 22 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.21.3-3
 - try fix for copy-release
 
diff --git a/sources b/sources
index eabaff3..5d968f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.21.3.tar.gz) = 36db54522e8564f467eb4f0b3c7c7cfe3bc8b285a47e139d35b3d7952184d78111640ae3b36eb1ddb92e1af68b16c9d4f056884c1bb25941606ec6cfe7347295
+SHA512 (v1.21.4.tar.gz) = 67d0f7211774a91230b22189670767d33c4eeb5115ebd31a7f6256497072542f517860442eaae454f784123a464ce336ca6101cbec684fb2b9432bb9ca693316