diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/.gitignore b/.gitignore
index 00b64cd..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1 @@
-SOURCES/dnsname-18822f9.tar.gz
-SOURCES/gvisor-tap-vsock-fdc231ae7b8fe1aec4cf0b8777274fa21b70d789.tar.gz
-SOURCES/podman-machine-cni-0749884.tar.gz
-SOURCES/v0.1.7.tar.gz
-SOURCES/v4.0-rhel-ee04ef9.tar.gz
-/dnsname-18822f9.tar.gz
-/gvisor-tap-vsock-fdc231ae7b8fe1aec4cf0b8777274fa21b70d789.tar.gz
-/podman-machine-cni-0749884.tar.gz
-/v0.1.7.tar.gz
-/v4.0-rhel-ee04ef9.tar.gz
+/*.tar.gz
diff --git a/gating.yaml b/gating.yaml
index e49fcf1..7eeedfc 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,7 +1,7 @@
 # recipients: jnovy, lsm5, santiago
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/plans/basic.fmf b/plans/basic.fmf
deleted file mode 100644
index c43473a..0000000
--- a/plans/basic.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Check basic functionality
-discover:
-    how: fmf
-execute:
-    how: tmt
diff --git a/podman.spec b/podman.spec
index 31a287e..47cfb55 100644
--- a/podman.spec
+++ b/podman.spec
@@ -8,7 +8,7 @@ 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 ee04ef92715a89a4000e057d4150e11775c5696c
+%global commit0 d54ecc8c3b635ee79d60a6eb4b04bd2a046f60f0
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.7
 #%%global dnsnamever 1.3.0
@@ -23,7 +23,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
 Epoch: 2
 Name: podman
 Version: 4.0.2
-Release: 12%{?dist}
+Release: 21%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -411,6 +411,11 @@ exit 0
 %{_libexecdir}/%{name}/gvproxy
 
 %changelog
+* 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: #2176055
+
 * Tue Nov 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.2-12
 - fix build of gvproxy
 - Related: #2123641
diff --git a/rpminspect.yaml b/rpminspect.yaml
deleted file mode 100644
index 0a65ac9..0000000
--- a/rpminspect.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-annocheck:
-  - hardened: --skip-pie --skip-lto --ignore-unknown --verbose
diff --git a/sources b/sources
index dd33c9d..f92ae1a 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
-SHA512 (gvisor-tap-vsock-fdc231ae7b8fe1aec4cf0b8777274fa21b70d789.tar.gz) = 9441a6b0dc64961994ec9c268ad81916c4b88bf5c508c32dc6b0f68a993dc0c57c92304bfaa525aafe6445107314fc6954a65dbfb53432450ac0076d7d68c1ba
 SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4
 SHA512 (v0.1.7.tar.gz) = 7d3174c60e1c8bd1f4b95b7751ccbe01cac63265060f18914b53311f68f7b4c63c693604f348ccfac5db4a96939169f835fbbbd614803b18062053d94f7dca67
-SHA512 (v4.0-rhel-ee04ef9.tar.gz) = ecb8d76bb56cd1f456fff89fa745d42b120e7dfb10e6b7f4065f4b24bdbdca6799153adf6d43e14a3a2764945dbff764246bb7b0d6f25179874ac7503415144e
+SHA512 (gvisor-tap-vsock-fdc231ae7b8fe1aec4cf0b8777274fa21b70d789.tar.gz) = 9441a6b0dc64961994ec9c268ad81916c4b88bf5c508c32dc6b0f68a993dc0c57c92304bfaa525aafe6445107314fc6954a65dbfb53432450ac0076d7d68c1ba
+SHA512 (v4.0-rhel-d54ecc8.tar.gz) = 920e2c48014ac9cb5db20a7afd717c5c92c2181f758a462a070c67b271c611bb8a65bff20a1b1e89e5305dbd11dc8f5c3f5c2723d71523ee0787abf5c495fc27
diff --git a/tests/main.fmf b/tests/main.fmf
deleted file mode 100644
index 765b81d..0000000
--- a/tests/main.fmf
+++ /dev/null
@@ -1,2 +0,0 @@
-require:
-  - podman
diff --git a/tests/smoke.fmf b/tests/smoke.fmf
deleted file mode 100644
index 97f2de4..0000000
--- a/tests/smoke.fmf
+++ /dev/null
@@ -1,2 +0,0 @@
-summary: Execute a simple command
-test: podman run -t --rm fedora cat /etc/os-release | grep 'Fedora Linux'
diff --git a/tests/tests.yml b/tests/tests.yml
index cd788d4..8a81cdb 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -12,17 +12,14 @@
       package: podman
       environment:
         PODMAN: /usr/bin/podman
-        QUADLET: /usr/libexec/podman/quadlet
 
     - name:    podman rootless
       package: podman
       environment:
         PODMAN: /usr/bin/podman
-        QUADLET: /usr/libexec/podman/quadlet
       become:  true
 
       #- name:    podman-remote root
       #package: podman
       #environment:
       #  PODMAN: /usr/bin/podman-remote
-      #  QUADLET: /usr/libexec/podman/quadlet
diff --git a/tests/tmt.fmf b/tests/tmt.fmf
deleted file mode 100644
index cd19cfe..0000000
--- a/tests/tmt.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-summary: Make sure that container provision works
-require:
-  - tmt-provision-container
-test:
-    tmt run --verbose --remove
-        provision --how container --image fedora
-        login --command 'cat /etc/os-release'
-        finish