diff --git a/.gitignore b/.gitignore
index 3651e6b..370aeb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -165,3 +165,4 @@
 /container-selinux-61b862a.tar.gz
 /container-selinux-99b40c5.tar.gz
 /container-selinux-563ba3f.tar.gz
+/v2.167.0.tar.gz
diff --git a/container-selinux.spec b/container-selinux.spec
index 7ab430f..6836025 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -2,12 +2,11 @@
 
 # container-selinux
 %global git0 https://github.com/containers/container-selinux
-%global commit0 563ba3f2693f98de5e79a7fbf5889222ab9a454a
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 # Used for comparing with latest upstream tag
-# to decide whether to autobuild (non-rawhide only)
-%define built_tag v2.164.1
+# to decide whether to autobuild
+%global built_tag v2.167.0
+%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 
 # container-selinux stuff (prefix with ds_ for version/release etc.)
 # Some bits borrowed from the openstack-selinux package
@@ -24,11 +23,11 @@
 Name: container-selinux
 Epoch: 2
 Version: 2.167.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 URL: %{git0}
 Summary: SELinux policies for container runtimes
-Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
+Source0: %{git0}/archive/%{built_tag}.tar.gz
 BuildArch: noarch
 BuildRequires: make
 BuildRequires: git-core
@@ -50,7 +49,7 @@ Provides: docker-selinux = %{?epoch:%{epoch}:}%{version}-%{release}
 SELinux policy modules for use with container runtimes.
 
 %prep
-%autosetup -Sgit -n %{name}-%{commit0}
+%autosetup -Sgit -n %{name}-%{built_tag_strip}
 
 %build
 make
@@ -112,6 +111,9 @@ fi
 
 # Hooked up to autobuilder, please check with @lsm5 before updating
 %changelog
+* Fri Sep 10 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.167.0-2
+- use upstream tag instead of commits, fix autobuild macros
+
 * Thu Aug 26 2021 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.167.0-1
 - autobuilt v2.167.0
 
diff --git a/sources b/sources
index f738a28..45d2aa8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (container-selinux-563ba3f.tar.gz) = fdafd3ca1094fb009893e664a2c59b81b7b95ba796ea7e960c0c2def45a0ed229f4dece63cd87faf14e6c1094848614633b322526bb2625c5df6df6abb568a50
+SHA512 (v2.167.0.tar.gz) = c46ca4ff144a976362d05cd02809b9eed95c3514a9fe7a57cbec65ec0cb42fb300f4a086981e2917f2b236f34b9754130f4e5f3c4f137b0d65ff8e85c4e0ba73