diff --git a/.gitignore b/.gitignore
index e23465f..a9c0e39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 SOURCES/dnsname-18822f9.tar.gz
-SOURCES/gvisor-tap-vsock-fdc231ae7b8fe1aec4cf0b8777274fa21b70d789.tar.gz
+SOURCES/gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz
 SOURCES/podman-machine-cni-0749884.tar.gz
 SOURCES/v0.1.7.tar.gz
 SOURCES/v4.0-rhel-d54ecc8.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 3c7a358..18ab85c 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,5 +1,5 @@
 00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.tar.gz
-4f46b03a20ca141f7ea10800282c0ba5aff9dcc2 SOURCES/gvisor-tap-vsock-fdc231ae7b8fe1aec4cf0b8777274fa21b70d789.tar.gz
+0a7a599e515fe9ab844f479b7ae6cc94ddab92b0 SOURCES/gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz
 70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz
 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz
 6f2429965ee695f727c0e2ea94adf5aedf008d10 SOURCES/v4.0-rhel-d54ecc8.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 3dec6ba..261b80d 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -15,15 +15,15 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
 %global commit_dnsname 18822f9a4fb35d1349eb256f4cd2bfd372474d84
 %global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7})
 %global gvproxyrepo gvisor-tap-vsock
-%global gvproxyver 0.4.0
-%global commit_gvproxy fdc231ae7b8fe1aec4cf0b8777274fa21b70d789
+%global gvproxyver 0.6.1
+%global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544
 %global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51
 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7})
 
 Epoch: 2
 Name: podman
 Version: 4.0.2
-Release: 20%{?dist}
+Release: 24%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -411,45 +411,28 @@ exit 0
 %{_libexecdir}/%{name}/gvproxy
 
 %changelog
-* Fri Feb 17 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-20
+* Mon Aug 28 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-24
+- rebuild for CVE-2023-29406
+- Related: #2176055
+
+* Thu Jun 15 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-23
+- rebuild for following CVEs:
+CVE-2022-41724 CVE-2022-41725 CVE-2023-24537 CVE-2023-24538 CVE-2023-24534 CVE-2023-24536 CVE-2022-41723 CVE-2023-24539 CVE-2023-24540 CVE-2023-29400
+- Resolves: #2179945
+- Resolves: #2187315
+- Resolves: #2187361
+- Resolves: #2203678
+- Resolves: #2207507
+
+* Wed Jun 14 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-22
+- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.6.1
+- fixes build with the new golang
+- Related: #2176055
+
+* Tue Mar 14 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-21
 - update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
   (https://github.com/containers/podman/commit/d54ecc8)
-- Related: #2123641
-
-* Thu Feb 09 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-19
-- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
-  (https://github.com/containers/podman/commit/0b00627)
-- Related: #2123641
-
-* Mon Feb 06 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-18
-- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
-  (https://github.com/containers/podman/commit/ccfe4dd)
-- Resolves: #2121541
-
-* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-17
-- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
-  (https://github.com/containers/podman/commit/1cc1f6c)
-- Related: #2129766
-
-* Wed Jan 25 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-16
-- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
-  (https://github.com/containers/podman/commit/11afff3)
-- Related: #2129766
-
-* Tue Jan 24 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-15
-- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
-  (https://github.com/containers/podman/commit/1602793)
-- Related: #2129766
-
-* Fri Jan 13 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-14
-- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
-  (https://github.com/containers/podman/commit/0a1d0e8)
-- Related: #2129766
-
-* Fri Nov 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-13
-- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel
-  (https://github.com/containers/podman/commit/94d8498)
-- Related: #2129766
+- Related: #2176055
 
 * Tue Nov 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-12
 - fix build of gvproxy