diff --git a/.gitignore b/.gitignore
index 2393f62..545da87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 SOURCES/dnsname-18822f9.tar.gz
 SOURCES/podman-machine-cni-0749884.tar.gz
-SOURCES/v0.1.0.tar.gz
 SOURCES/v0.1.7.tar.gz
-SOURCES/v4.0-rhel-3d24a66.tar.gz
+SOURCES/v0.2.0.tar.gz
+SOURCES/v4.0-rhel-33084eb.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 899bd6b..54ad2bd 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,5 +1,5 @@
 00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.tar.gz
 70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz
-d2be14e364fef2d95c61cdac528219548640f6d4 SOURCES/v0.1.0.tar.gz
 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz
-5893bd5b68df60051c709c6df7778cc8929d1d83 SOURCES/v4.0-rhel-3d24a66.tar.gz
+64a6ff113705a3726bc0d7d45e6c697b999c2683 SOURCES/v0.2.0.tar.gz
+29136b52394c601345c3169510fe283b3ff7f7bf SOURCES/v4.0-rhel-33084eb.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 1bc9d3b..2a85b0d 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -8,21 +8,21 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
 
 %global import_path github.com/containers/podman
 %global branch v4.0-rhel
-%global commit0 3d24a66f0dccc7cbf62dfb2d406409c88a568cdf
+%global commit0 33084ebddd42a41d50e3426ff81d69115404ab33
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.7
 #%%global dnsnamever 1.3.0
 %global commit_dnsname 18822f9a4fb35d1349eb256f4cd2bfd372474d84
 %global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7})
 %global gvproxyrepo gvisor-tap-vsock
-%global gvproxyver 0.1.0
+%global gvproxyver 0.2.0
 %global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51
 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7})
 
 Epoch: 2
 Name: podman
 Version: 4.0.2
-Release: 5%{?dist}
+Release: 8%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -40,7 +40,7 @@ Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar
 ExclusiveArch: %{go_arches}
 Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release}
-BuildRequires: golang >= 1.16.6
+BuildRequires: golang >= 1.17.7
 BuildRequires: glib2-devel
 BuildRequires: glibc-devel
 BuildRequires: glibc-static
@@ -409,31 +409,72 @@ exit 0
 %{_libexecdir}/%{name}/gvproxy
 
 %changelog
-* Wed Mar 30 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-5
+* Tue Aug 02 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-8
 - update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
-  (https://github.com/containers/podman/commit/3d24a66)
-- Related: #2066493
+  (https://github.com/containers/podman/commit/33084eb)
+- Related: #2061390
 
-* Fri Mar 25 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-4
+* Wed Jul 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-7
 - update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
-  (https://github.com/containers/podman/commit/bb1e6e6)
-- fixes CVE-2022-21698
-- Related: #2066493
+  (https://github.com/containers/podman/commit/3efe4c2)
+- Related: #2061390
 
-* Thu Mar 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-3
+* Fri Jun 03 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-6
 - update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
-  (https://github.com/containers/podman/commit/5a54f81)
-- Resolves: #2066493
-- Related: #2001445
+  (https://github.com/containers/podman/commit/bfc8b36)
+- Related: #2061390
+
+* Fri May 13 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-5
+- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
+  (https://github.com/containers/podman/commit/2e12f02)
+- Related: #2061390
+
+* Thu May 12 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-4
+- update gvisor-tap-vsock to 0.2.0 to fix compilation with golang 1.18
+- Related: #2061390
+
+* Fri May 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-3
+- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
+  (https://github.com/containers/podman/commit/6cb5039)
+- Related: #2061390
+
+* Wed May 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-2
+- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
+  (https://github.com/containers/podman/commit/ce91610)
+- Related: #2061390
 
-* Tue Mar 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-2
+* Wed Apr 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-1
 - update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
-  (https://github.com/containers/podman/commit/9237d75)
-- Related: #2059296
+  (https://github.com/containers/podman/commit/94aa329)
+- Related: #2061390
+
+* Wed Apr 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.3-3
+- switch to v4.0-rhel maintenance branch for 4.0 stable stream
+- Related: #2061390
+
+* Fri Apr 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.3-2
+- bump golang BR to 1.17.7
+- Related: #2061390
+
+* Fri Apr 01 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.3-1
+- update to https://github.com/containers/podman/releases/tag/v4.0.3
+- Related: #2061390
+
+* Wed Mar 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-4
+- bump minimal libseccomp version requirement
+- Related: #2061390
+
+* Tue Mar 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-3
+- update to https://github.com/containers/podman/releases/tag/v4.0.2
+- Related: #2061390
+
+* Fri Mar 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-2
+- update to https://github.com/containers/podman/releases/tag/v4.0.2
+- Related: #2061390
 
-* Wed Mar 02 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-1
+* Mon Mar 07 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-1
 - update to https://github.com/containers/podman/releases/tag/v4.0.2
-- Related: #2059754
+- Related: #2061390
 
 * Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.1-1
 - update to https://github.com/containers/podman/releases/tag/v4.0.1