diff --git a/.gitignore b/.gitignore
index d88ff0f..e39994f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,7 @@
 /rhel-9-20230426.xml.gz
 /epel-9-20230426-icons.tar.gz
 /epel-9-20230426.xml.gz
+/rhel-9-20230504-icons.tar.gz
+/rhel-9-20230504.xml.gz
+/epel-9-20230504-icons.tar.gz
+/epel-9-20230504.xml.gz
diff --git a/appstream-data.spec b/appstream-data.spec
index 72373eb..f3b3993 100644
--- a/appstream-data.spec
+++ b/appstream-data.spec
@@ -1,4 +1,4 @@
-%define gitdate 20230426
+%define gitdate 20230504
 %global enable_epel 1
 
 Summary:   Cached AppStream metadata
@@ -24,11 +24,13 @@ Source10:  http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}-
 %endif
 
 # This is built using:
+# sudo dnf makecache --enablerepo rhel-9-baseos --enablerepo rhel-9-appstream --enablerepo rhel-9-crb
 # export ARCHIVE_PATH=/run/media/hughsie/Backup/mirror
 # dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-baseos -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-baseos.log
 # dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-appstream -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-appstream.log
 # dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-crb -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-crb.log
 # https://github.com/hughsie/appstream-scripts/blob/master/rhel/rhel-9-candidate.sh
+# then the sources need to be uploaded to people.redhat.com/rhughes/metadata/
 
 BuildRequires: libappstream-glib
 
@@ -62,6 +64,10 @@ DESTDIR=%{buildroot} appstream-util install \
 %dir %{_datadir}/app-info/xmls
 
 %changelog
+* Thu May 04 2023 Richard Hughes <richard@hughsie.com> 1:9-20230504
+- New metadata version
+- Resolves: rhbz#2062807
+
 * Wed Apr 26 2023 Richard Hughes <richard@hughsie.com> 1:9-20230426
 - New metadata version
 - Resolves: rhbz#2062807
diff --git a/rhel.repo b/rhel.repo
index 407ec0e..447bd34 100644
--- a/rhel.repo
+++ b/rhel.repo
@@ -1,17 +1,17 @@
 [rhel-9-baseos]
 name=Nightly Packages for Enterprise Linux 9
-baseurl=http://download.eng.brq.redhat.com/rhel-9/development/RHEL-9/latest-RHEL-9/compose/BaseOS/x86_64/os/
+baseurl=http://download.eng.brq.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9/compose/BaseOS/x86_64/os/
 enabled=1
 gpgcheck=0
 
 [rhel-9-appstream]
 name=Nightly Packages for Enterprise Linux 9
-baseurl=http://download.eng.brq.redhat.com/rhel-9/development/RHEL-9/latest-RHEL-9/compose/AppStream/x86_64/os/
+baseurl=http://download.eng.brq.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9/compose/AppStream/x86_64/os/
 enabled=1
 gpgcheck=0
 
 [rhel-9-crb]
 name=Nightly Packages for Enterprise Linux 9
-baseurl=http://download.eng.brq.redhat.com/rhel-9/development/RHEL-9/latest-RHEL-9/compose/CRB/x86_64/os/
+baseurl=http://download.eng.brq.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9/compose/CRB/x86_64/os/
 enabled=1
 gpgcheck=0
diff --git a/sources b/sources
index f196cc9..f9b3bd9 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (rhel-9-20230426-icons.tar.gz) = 7f2f3f7f071b3da812bc27a313a80ebd0725e7d3a318eb475c1b2bb3399fdfcf16b069a1c7171c444ad448092d627d318997272e956a553595595fbabe48b0e1
-SHA512 (rhel-9-20230426.xml.gz) = 8c4a0c26062911658a11543113db65c7229c6a52ee4a24c80bf0a38b7fc5d9525e3225ed480d662c4420f0e96d3614d9f2ef044c8d071c8a618c2a4e438871ca
-SHA512 (epel-9-20230426-icons.tar.gz) = 8aead728755d92ab1a8e4d0fb7a0b77b6fbdbd1654d1de99490de7997979aa2bfbcb0918e3a3d1ddbd82926161e85632318ab4a6600a41ced1b9f8bd6b6dfeeb
-SHA512 (epel-9-20230426.xml.gz) = e95ef4b79b6e9f18de257640235d7fa823c839254723b3917f9d683a56b7bf719e51b8d8c24b047143021d477d017c8e319d0e75bba09b1d8fb0c971f864f3c0
+SHA512 (rhel-9-20230504-icons.tar.gz) = 34eeeb24bdcef50d7ceaecc014b1bd45d462cc1ab0d8df806cb8316187cd5bf949f27871d561d9597b236342439fab31b961aa13e7dc838358149efa457851a3
+SHA512 (rhel-9-20230504.xml.gz) = 130ee33ec58e09f702eb8f779dfcd65842cb4573136e553d2bb5468869c295225532c23ac5fb074a725b2026d110f494b90fe58a27b2acc6fe9cad5eefc609f5
+SHA512 (epel-9-20230504-icons.tar.gz) = 8aead728755d92ab1a8e4d0fb7a0b77b6fbdbd1654d1de99490de7997979aa2bfbcb0918e3a3d1ddbd82926161e85632318ab4a6600a41ced1b9f8bd6b6dfeeb
+SHA512 (epel-9-20230504.xml.gz) = e95ef4b79b6e9f18de257640235d7fa823c839254723b3917f9d683a56b7bf719e51b8d8c24b047143021d477d017c8e319d0e75bba09b1d8fb0c971f864f3c0