diff --git a/SPECS/centos-release-hyperscale.spec b/SPECS/centos-release-hyperscale.spec
index fd3e93c..c8c631e 100644
--- a/SPECS/centos-release-hyperscale.spec
+++ b/SPECS/centos-release-hyperscale.spec
@@ -1,30 +1,51 @@
 Summary: CentOS Hyperscale SIG main repo configs
 Name: centos-release-hyperscale
-Version: 2
+Version: 3
 Release: 1%{?dist}
 License: GPL
 URL: http://wiki.centos.org/SpecialInterestGroup/Hyperscale
-Source0: CentOS-Stream-Hyperscale.repo
+Source0: RPM-GPG-KEY-CentOS-SIG-HyperScale
+Source1: CentOS-Stream-Hyperscale.repo
+Source2: CentOS-Stream-Hyperscale-Experimental.repo
 
 BuildArch: noarch
 
-Requires: centos-hyperscale-keys
+Conflicts: centos-hyperscale-keys
+Obsoletes: centos-hyperscale-keys
 Requires: centos-stream-release
 
 %description
-Configs for the CentOS Hyperscale SIG main package repository
+Configs for the CentOS Hyperscale SIG main package repository.
+
+%package experimental
+Summary: CentOS Hyperscale SIG experimental repo configs
+
+%description experimental
+Configs for the CentOS Hyperscale SIG experimental package repository.
 
 %prep
 
 %install
+install -p -d %{buildroot}%{_sysconfdir}/pki/rpm-gpg
+install -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 install -p -d %{buildroot}%{_sysconfdir}/yum.repos.d
-install -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d
+install -m 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d
 
 %files
 %defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/yum.repos.d/*
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-HyperScale
+%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Stream-Hyperscale.repo
+
+%files experimental
+%defattr(-,root,root)
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-HyperScale
+%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Stream-Hyperscale-Experimental.repo
 
 %changelog
+* Fri Apr 09 2021 Davide Cavalca <dcavalca@fb.com> - 3-1
+- Bring the keys back in and obsolete centos-hyperscale-keys
+- Bring centos-release-hyperscale-experimental in as a subpackage
+
 * Thu Apr 08 2021 Davide Cavalca <dcavalca@fb.com> - 2-1
 - Factor out keys in centos-hyperscale-keys and require it
 
@@ -33,4 +54,3 @@ install -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d
 
 * Wed Feb 10 2021 Davide Cavalca <dcavalca@fb.com> - 1-1
 - Initial release
-