diff --git a/.gitignore b/.gitignore
index b9ad26f..ee2e234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/master-6f6cc1c.tar.gz
+SOURCES/main-ec5c7c1.tar.gz
 SOURCES/v0.1.5.tar.gz
 SOURCES/v1.1.1.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 051c397..2daea71 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,3 +1,3 @@
-c5edf7f7edf707db0c4315a47e591023864a497c SOURCES/master-6f6cc1c.tar.gz
+229f084ccc05d522dc0c9b8aad91e67daa005b32 SOURCES/main-ec5c7c1.tar.gz
 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz
 3d883ef197eeb1a602dfef79ee1027847cfd40a4 SOURCES/v1.1.1.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index dd64d4e..862423a 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -1,5 +1,8 @@
 %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
 
@@ -13,15 +16,15 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 %endif
 
 %global import_path github.com/containers/podman
-%global branch master
-%global commit0 6f6cc1cce66709f569fbd8fafc9ed5425120bc41
+%global branch main
+%global commit0 ec5c7c1f6a1898dacddb6cc35802525c288b61ef
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.5
 %global dnsnamever 1.1.1
 
 Name: podman
-Version: 3.1.0
-Release: 0.8%{?dist}
+Version: 3.3.0
+Release: 0.15%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -40,7 +43,7 @@ BuildRequires: golang >= 1.12.12-4
 BuildRequires: glib2-devel
 BuildRequires: glibc-devel
 BuildRequires: glibc-static
-BuildRequires: git
+BuildRequires: git-core
 BuildRequires: go-md2man
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
@@ -59,12 +62,12 @@ BuildRequires: file
 BuildRequires: gcc
 BuildRequires: libtool
 Requires: containers-common >= 0.1.29-3
-Requires: containernetworking-plugins >= 0.8.1-1
+Requires: containernetworking-plugins >= 0.9.1-1
 Requires: iptables
 Requires: nftables
 Obsoletes: oci-systemd-hook < 1
 Requires: libseccomp >= 2.4.1
-Requires: conmon
+Requires: conmon >= 2.0.25
 Requires: (container-selinux if selinux-policy)
 Requires: slirp4netns >= 0.4.0-1
 Requires: runc >= 1.0.0-57
@@ -144,6 +147,9 @@ Requires: nmap-ncat
 Requires: httpd-tools
 Requires: jq
 Requires: socat
+Requires: skopeo
+Requires: openssl
+Requires: buildah
 
 %description tests
 %{summary}
@@ -226,7 +232,6 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \
         install.bin-nobuild \
         install.remote-nobuild \
         install.man-nobuild \
-        install.cni \
         install.systemd \
         install.completions \
         install.docker
@@ -255,6 +260,10 @@ pushd dnsname-%{dnsnamever}
 %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
 popd
 
+# install CNI
+install -dp %{buildroot}%{_sysconfdir}/cni/net.d
+install -p cni/87-podman-bridge.conflist %{buildroot}%{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
+
 %check
 %if 0%{?with_check}
 # Since we aren't packaging up the vendor directory we need to link
@@ -293,14 +302,12 @@ exit 0
 %dir %{_datadir}/fish/vendor_completions.d
 %{_datadir}/fish/vendor_completions.d/%{name}.fish
 %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
-%{_unitdir}/%{name}.service
-%{_unitdir}/%{name}.socket
-%{_unitdir}/%{name}-auto-update.service
-%{_unitdir}/%{name}-auto-update.timer
-%{_userunitdir}/%{name}.service
-%{_userunitdir}/%{name}.socket
-%{_userunitdir}/%{name}-auto-update.service
-%{_userunitdir}/%{name}-auto-update.timer
+%{_unitdir}/*.service
+%{_unitdir}/*.socket
+%{_unitdir}/*.timer
+%{_userunitdir}/*.service
+%{_userunitdir}/*.socket
+%{_userunitdir}/*.timer
 %{_usr}/lib/tmpfiles.d/%{name}.conf
 
 %files docker
@@ -337,6 +344,360 @@ exit 0
 %{_datadir}/%{name}/test
 
 %changelog
+* Mon Jul 26 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.15
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/ec5c7c1)
+- Related: #1934415
+
+* Wed Jul 21 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.14
+- update to the latest content of https://github.com/containers/podman/tree/main
+  (https://github.com/containers/podman/commit/0ef01c8)
+- Related: #1934415
+
+* Wed Jul 21 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.13
+- switch to the main branch as podman-3.3.x is targeted at 8.5.0
+- Related: #1934415
+
+* Wed Jul 21 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.9
+- switch to v3.2.3-rhel branch
+- Related: #1934415
+
+* Wed Jul 14 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.8
+- update to the latest content of https://github.com/containers/podman/tree/v3.2
+  (https://github.com/containers/podman/commit/4136f8b)
+- Related: #1934415
+
+* Fri Jul 09 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.7
+- update to the latest content of https://github.com/containers/podman/tree/v3.2
+  (https://github.com/containers/podman/commit/60d12f7)
+- Related: #1934415
+
+* Thu Jul 08 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.6
+- update to the latest content of https://github.com/containers/podman/tree/v3.2
+  (https://github.com/containers/podman/commit/275b0d8)
+- Related: #1934415
+
+* Wed Jul 07 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.5
+- put 87-podman-bridge.conflist to main podman package not podman-remote
+- Related: #1934415
+
+* Wed Jul 07 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.4
+- install CNI manually as install.cni target is missing from the Makefile
+- simplify unit file packaging
+- Related: #1934415
+
+* Mon Jul 05 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.3
+- update to the latest content of https://github.com/containers/podman/tree/v3.2
+  (https://github.com/containers/podman/commit/6f0bf16)
+- Related: #1934415
+
+* Fri Jul 02 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.2
+- install CNI properly
+- Related: #1934415
+
+* Fri Jul 02 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.1
+- update to the latest content of https://github.com/containers/podman/tree/v3.2
+  (https://github.com/containers/podman/commit/ac740c6)
+- Related: #1934415
+
+* Thu Jul 01 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.2-2
+- remove missing unit files
+- Related: #1934415
+
+* Thu Jul 01 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.2-1
+- consume content from v3.2 upstream branch
+- Related: #1934415
+
+* Tue Jun 29 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.12
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/c260cbd)
+- Related: #1934415
+
+* Mon Jun 28 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.11
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/0a0ade3)
+- Related: #1934415
+
+* Fri Jun 25 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.10
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/d1f57a0)
+- Related: #1934415
+
+* Thu Jun 24 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.9
+- add missing unit files
+- Related: #1934415
+
+* Wed Jun 23 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.8
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/e159eb8)
+- Related: #1934415
+
+* Tue Jun 22 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.7
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/be15e69)
+- Related: #1934415
+
+* Mon Jun 21 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.6
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/928687e)
+- Related: #1934415
+
+* Thu Jun 17 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.5
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/814a8b6)
+- Related: #1934415
+
+* Tue Jun 15 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.4
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/e2f51ee)
+- Related: #1934415
+
+* Thu Jun 10 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.3
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/d116beb)
+- Related: #1934415
+
+* Wed Jun 09 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.2
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/da1bade)
+- Related: #1934415
+
+* Tue Jun 08 2021 Jindrich Novy <jnovy@redhat.com> - 3.3.0-0.1
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/df3b6da)
+- Related: #1934415
+
+* Mon Jun 07 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.33
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/5a209b3)
+- Related: #1934415
+
+* Fri Jun 04 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.32
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/f7233a2)
+- Related: #1934415
+
+* Thu Jun 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.31
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/52dae69)
+- Related: #1934415
+
+* Wed Jun 02 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.30
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/41c76d6)
+- Related: #1934415
+
+* Tue Jun 01 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.29
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/8f5f0cf)
+- Related: #1934415
+
+* Mon May 31 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.28
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/5923676)
+- Related: #1934415
+
+* Thu May 27 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.27
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/d9eb126)
+- Related: #1934415
+
+* Wed May 26 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.26
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/ac94be3)
+- Related: #1934415
+
+* Wed May 26 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.25
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/c5b3cba)
+- Related: #1934415
+
+* Tue May 25 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.24
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/a6f0ac2)
+- Related: #1934415
+
+* Mon May 24 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.23
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/b060a77)
+- Related: #1934415
+
+* Sat May 22 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.22
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/490915c)
+- Related: #1934415
+
+* Fri May 21 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.21
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/e48aa8c)
+- Related: #1934415
+
+* Thu May 20 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.20
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/8bc39f4)
+- Related: #1934415
+
+* Wed May 19 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.19
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/4c75626)
+- Related: #1934415
+
+* Wed May 19 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.18
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/959d6a0)
+- Related: #1934415
+
+* Mon May 17 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.17
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/3bdbe3c)
+- Related: #1934415
+
+* Thu May 13 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.16
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/4dc52f6)
+- Related: #1934415
+
+* Wed May 12 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.15
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/59dd357)
+- Related: #1934415
+
+* Tue May 11 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.14
+- require at least conmon >= 2.0.25 to assure rootless podman is able to start containers
+- Related: #1934415
+
+* Tue May 11 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.13
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/8dcd5b8)
+- Related: #1934415
+
+* Tue May 11 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.12
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/57b6425)
+- Related: #1934415
+
+* Mon May 10 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.11
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/54bed10)
+- Related: #1934415
+
+* Fri May 07 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.10
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/034470e)
+- Related: #1934415
+
+* Thu May 06 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.9
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/b6405c1)
+- Related: #1934415
+
+* Thu May 06 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.8
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/ed6f399)
+- Related: #1934415
+
+* Wed May 05 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.7
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/8eefca5)
+- Related: #1934415
+
+* Tue May 04 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.6
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/9788289)
+- Related: #1934415
+
+* Mon May 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.5
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/697ec8f)
+- Related: #1934415
+
+* Fri Apr 30 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.4
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/49eb047)
+- Related: #1934415
+
+* Thu Apr 29 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.3
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/db67fed)
+- Related: #1934415
+
+* Wed Apr 28 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.2
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/5dc9faf)
+- Related: #1934415
+
+* Mon Apr 26 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.1
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/9ca53cf)
+- Related: #1934415
+
+* Wed Apr 07 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-11
+- use tarball from 3.0.1-rhel branch
+- Related: #1934415
+
+* Wed Apr 07 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-2
+- bump release to ensure upgrade path
+- Related: #1934415
+
+* Tue Apr 06 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-1
+- revert to 3.0.1-rhel as 3.1.0 and 3.2.0 is currently broken
+- Related: #1934415
+
+* Tue Apr 06 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.5
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/2b13c5d)
+- Related: #1934415
+
+* Thu Apr 01 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.4
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/12881ab)
+- Related: #1934415
+
+* Wed Mar 31 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.3
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/a373e2f)
+- Related: #1934415
+
+* Tue Mar 30 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.0-0.2
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/5eb5950)
+- Related: #1934415
+
+* Mon Mar 29 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.15
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/ccbe7e9)
+- Related: #1934415
+
+* Fri Mar 26 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.14
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/9e23e0b)
+- Related: #1934415
+
+* Thu Mar 25 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.13
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/e523d09)
+- Related: #1934415
+
+* Wed Mar 24 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.12
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/860de13)
+- Related: #1934415
+
+* Tue Mar 23 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.11
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/60c90c3)
+- Related: #1934415
+
+* Mon Mar 22 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.10
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/ebc9871)
+- Related: #1934415
+
+* Fri Mar 19 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.9
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/5d9b070)
+- Related: #1934415
+
 * Thu Mar 18 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.8
 - update to the latest content of https://github.com/containers/podman/tree/master
   (https://github.com/containers/podman/commit/6f6cc1c)