diff --git a/containers-common.spec b/containers-common.spec
index 579cefa..15bae8d 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -40,7 +40,7 @@ Epoch: 5
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
 Version: 0.60.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Apache-2.0
 BuildArch: noarch
 # for BuildRequires: go-md2man
@@ -153,9 +153,11 @@ install -Dp -m0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/containers/policy.json
 install -Dp -m0644 registries.conf %{buildroot}%{_sysconfdir}/containers/registries.conf
 install -Dp -m0644 storage.conf %{buildroot}%{_datadir}/containers/storage.conf
 
+%if 0%{?fedora} || 0%{?centos}
 install -dp %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 install -m0644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 install -m0644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
+%endif
 
 install -Dp -m0644 contrib/redhat/registry.access.redhat.com.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d
 install -Dp -m0644 contrib/redhat/registry.redhat.io.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d
@@ -197,7 +199,10 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/
 %config(noreplace) %{_sysconfdir}/containers/policy.json
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
-%{_sysconfdir}/pki/rpm-gpg/*
+%if 0%{?fedora} || 0%{?centos}
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta
+%endif
 %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
 %config(noreplace) %{_sysconfdir}/containers/registries.d/registry.redhat.io.yaml
 %config(noreplace) %{_sysconfdir}/containers/registries.d/registry.access.redhat.com.yaml
@@ -221,6 +226,10 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/
 %files extra
 
 %changelog
+* Tue Sep 10 2024 Jindrich Novy <jnovy@redhat.com> - 5:0.60.2-6
+- package GPG keys only on Fedora and CentOS
+- Related: RHEL-39410
+
 * Mon Sep 09 2024 Jindrich Novy <jnovy@redhat.com> - 5:0.60.2-5
 - include relevant GPG keys
 - Resolves: RHEL-57720