diff --git a/containers-common.spec b/containers-common.spec
index e2fbdab..111aa99 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 57%{?dist}
+Release: 58%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 ExclusiveArch: %{go_arches}
@@ -173,6 +173,10 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Thu Sep 14 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-58
+- implement GPG auto updating mechanism from redhat-release
+- Resolves: #RHEL-3164
+
 * Wed Sep 13 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-57
 - update GPG keys to the current content of redhat-release
 - Resolves: #RHEL-3164
diff --git a/update.sh b/update.sh
index 5759357..64409fe 100755
--- a/update.sh
+++ b/update.sh
@@ -58,3 +58,10 @@ fi
 				"keyctl",' seccomp.json
 [ `grep \"socket\", seccomp.json | wc -l` == 0 ] && sed -i '/\"socketcall\",/i \
 				"socket",' seccomp.json
+rhpkg clone redhat-release
+cd redhat-release
+rhpkg switch-branch rhel-9.4.0
+rhpkg prep
+cp -f redhat-release-*/RPM-GPG* ../
+cd -
+rm -rf redhat-release