diff --git a/SOURCES/CentOS-Messaging-qpid-proton.repo b/SOURCES/CentOS-Messaging-qpid-proton.repo
index 7cb1c58..dab74f2 100644
--- a/SOURCES/CentOS-Messaging-qpid-proton.repo
+++ b/SOURCES/CentOS-Messaging-qpid-proton.repo
@@ -1,27 +1,27 @@
 [centos-qpid-proton]
 name=CentOS-8 - QPID Proton
 #baseurl=http://mirror.centos.org/centos/$releasever/messaging/$basearch/qpid-proton
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=messaging-qpid-proton
+mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=messaging-qpid-proton
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Messaging
 
 [centos-qpid-proton-test]
 name=CentOS-8 - QPID Proton Testing
-baseurl=https://buildlogs.centos.org/centos/$releasever/messaging/$basearch/qpid-proton
+baseurl=https://buildlogs.centos.org/centos/$stream/messaging/$basearch/qpid-proton
 gpgcheck=0
 enabled=0
 
 [centos-qpid-proton-debuginfo]
 name=CentOS-8 - QPID Proton - Debug
-baseurl=http://debuginfo.centos.org/centos/$releasever/messaging/$basearch/
+baseurl=http://debuginfo.centos.org/centos/$stream/messaging/$basearch/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Messaging
 
 [centos-qpid-proton-source]
 name=CentOS-8 - QPID Proton - Source
-baseurl=http://vault.centos.org/centos/$releasever/messaging/Source/qpid-proton/
+baseurl=http://vault.centos.org/centos/$stream/messaging/Source/qpid-proton/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Messaging
diff --git a/SOURCES/CentOS-Messaging-rabbitmq.repo b/SOURCES/CentOS-Messaging-rabbitmq.repo
index 46b87d6..ef8b357 100644
--- a/SOURCES/CentOS-Messaging-rabbitmq.repo
+++ b/SOURCES/CentOS-Messaging-rabbitmq.repo
@@ -1,27 +1,27 @@
 [centos-rabbitmq-RABBITMQ_VERSION]
 name=CentOS-8 - RabbitMQ RABBITMQ_VERSION
 #baseurl=http://mirror.centos.org/centos/$releasever/messaging/$basearch/rabbitmq-RABBITMQ_VERSION
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=messaging-rabbitmq-RABBITMQ_VERSION
+mirrorlist=http://mirrorlist.centos.org/?release=8-stream&arch=$basearch&repo=messaging-rabbitmq-RABBITMQ_VERSION
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Messaging
 
 [centos-rabbitmq-RABBITMQ_VERSION-test]
 name=CentOS-8 - RabbitMQ RABBITMQ_VERSION Testing
-baseurl=https://buildlogs.centos.org/centos/$releasever/messaging/$basearch/rabbitmq-RABBITMQ_VERSION/
+baseurl=https://buildlogs.centos.org/centos/$stream/messaging/$basearch/rabbitmq-RABBITMQ_VERSION/
 gpgcheck=0
 enabled=0
 
 [centos-rabbitmq-RABBITMQ_VERSION-debuginfo]
 name=CentOS-8 - RabbitMQ RABBITMQ_VERSION - Debug
-baseurl=http://debuginfo.centos.org/centos/$releasever/messaging/$basearch/
+baseurl=http://debuginfo.centos.org/centos/$stream/messaging/$basearch/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Messaging
 
 [centos-rabbitmq-RABBITMQ_VERSION-source]
 name=CentOS-8 - RabbitMQ RABBITMQ_VERSION - Source
-baseurl=http://vault.centos.org/centos/$releasever/messaging/Source/rabbitmq-RABBITMQ_VERSION/
+baseurl=http://vault.centos.org/centos/$stream/messaging/Source/rabbitmq-RABBITMQ_VERSION/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Messaging
diff --git a/SPECS/centos-release-messaging.spec b/SPECS/centos-release-messaging.spec
index d78d381..55700f9 100644
--- a/SPECS/centos-release-messaging.spec
+++ b/SPECS/centos-release-messaging.spec
@@ -2,7 +2,7 @@
 Summary: Config to enable the repository for the Messaging SIG
 Name:    centos-release-messaging
 Version: 1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 URL: http://wiki.centos.org/SpecialInterestGroup/Messaging
 Source0: RPM-GPG-KEY-CentOS-SIG-Messaging
@@ -62,6 +62,9 @@ sed -i -e "s/RABBITMQ_VERSION/%{RabbitMQVersion}/g" %{buildroot}%{_sysconfdir}/y
 %config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Messaging-rabbitmq.repo
 
 %changelog
+* Tue Feb 01 2022 Alfredo Moralejo <amoralej@redhat.com> - 1-3
+- Move to CentOs Stream 8
+
 * Tue Apr 07 2020 Matthias Runge <mrunge@redhat.com> - 1.2
 - add qpid-proton subpackage
 - move gpg key to common