diff --git a/.gitignore b/.gitignore
index 6b34fe0..7db3b7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-SOURCES/podman-machine-cni-afab2d8.tar.gz
+SOURCES/main-800d594.tar.gz
+SOURCES/podman-machine-cni-0749884.tar.gz
 SOURCES/v0.1.0.tar.gz
 SOURCES/v0.1.5.tar.gz
 SOURCES/v1.3.0.tar.gz
-SOURCES/v3.3.1-rhel-910b09c.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 5978ca4..530edd5 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,5 +1,5 @@
-2b197d002b649ea3c8ff91500a1d56c21e1bf749 SOURCES/podman-machine-cni-afab2d8.tar.gz
+50b67c1c8ce5d0de17fe840db33c504ed1a09f40 SOURCES/main-800d594.tar.gz
+70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz
 d2be14e364fef2d95c61cdac528219548640f6d4 SOURCES/v0.1.0.tar.gz
 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz
 667dcf5bea5992e18963bac6b833053a0d8b1eaa SOURCES/v1.3.0.tar.gz
-d1eb93515f32065e3cb5b539bf4060d8615366ac SOURCES/v3.3.1-rhel-910b09c.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 9efb7c8..ff94ce8 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -1,8 +1,5 @@
 %global with_check 0
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1904567
-%global _lto_cflags %%{nil}
-
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
 
@@ -16,20 +13,20 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 %endif
 
 %global import_path github.com/containers/podman
-%global branch v3.3.1-rhel
-%global commit0 910b09c2551b168efec4ac05adfa4d5b95782b54
+%global branch main
+%global commit0 800d594afa160353cc7134ef912bf82f266a122c
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.5
 %global dnsnamever 1.3.0
 %global gvproxyrepo gvisor-tap-vsock
 %global gvproxyver 0.1.0
-%global commit_mcni afab2d8047bc0bd963d570686770eeb0c2e5a396
+%global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51
 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7})
 
 
 Name: podman
-Version: 3.3.1
-Release: 9%{?dist}
+Version: 4.0.0
+Release: 0.10%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -399,15 +396,56 @@ exit 0
 %{_libexecdir}/%{name}/gvproxy
 
 %changelog
-* Tue Sep 21 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.1-9
-- update to the latest content of https://github.com/containers/podman/tree/v3.3.1-rhel
-  (https://github.com/containers/podman/commit/910b09c)
-- Related: #2000943
+* Fri Sep 24 2021 Jindrich Novy <jnovy@redhat.com> - 4.0.0-0.10
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/800d594)
+- Related: #2001445
 
-* Mon Sep 13 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.1-8
-- update to the latest content of https://github.com/containers/podman/tree/v3.3.1-rhel
-  (https://github.com/containers/podman/commit/8305248)
-- Resolves: #2000943
+* Thu Sep 23 2021 Jindrich Novy <jnovy@redhat.com> - 4.0.0-0.9
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/1dba601)
+- Related: #2001445
+
+* Wed Sep 22 2021 Jindrich Novy <jnovy@redhat.com> - 4.0.0-0.8
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/8e2d25e)
+- Related: #2001445
+
+* Tue Sep 21 2021 Jindrich Novy <jnovy@redhat.com> - 4.0.0-0.7
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/b925d70)
+- Related: #2001445
+
+* Mon Sep 20 2021 Jindrich Novy <jnovy@redhat.com> - 4.0.0-0.6
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/ddb3844)
+- Related: #2001445
+
+* Fri Sep 17 2021 Jindrich Novy <jnovy@redhat.com> - 4.0.0-0.5
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/84c61b7)
+- Related: #2001445
+
+* Thu Sep 16 2021 Jindrich Novy <jnovy@redhat.com> - 4.0.0-0.4
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/5f41ffd)
+- update to https://github.com/containers/podman-machine-cni/releases/tag/v0.2.0
+- Related: #2001445
+
+* Wed Sep 15 2021 Jindrich Novy <jnovy@redhat.com> - 4.0.0-0.3
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/323fe36)
+- Related: #2001445
+
+* Mon Sep 13 2021 Jindrich Novy <jnovy@redhat.com> - 4.0.0-0.2
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/0f3d3bd)
+- Related: #2001445
+
+* Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 4.0.0-0.1
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/63f6656)
+- Related: #2001445
 
 * Mon Aug 30 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 3.3.1-7
 - update to the latest content of https://github.com/containers/podman/tree/v3.3.1-rhel