diff --git a/master-galera/master.cfg b/master-galera/master.cfg
index e8cd5245..9d1413c2 100644
--- a/master-galera/master.cfg
+++ b/master-galera/master.cfg
@@ -341,10 +341,16 @@ f_rpm_build.addStep(
         && cat << EOF > /packages/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/galera.repo
 [Galera-%(prop:branch)s]
 name=Galera %(prop:branch)s repo (build %(prop:tarbuildnum)s)
-baseurl=%(kw:url)s/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/rpms
+baseurl=%(kw:url)s/galera/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/rpms
 gpgcheck=0
 EOF
-        cp -r rpms srpms sha256sums.txt /packages/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/ \
+        case "%(prop:buildername)s" in
+        *rhel-8|*stream8)
+            echo "module_hotfixes = 1" >> /packages/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/galera.repo
+            ;;
+        esac \
+        && createrepo rpms/ \
+        && cp -r rpms srpms sha256sums.txt /packages/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/ \
         && ln -sf %(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/galera.repo /packages/%(prop:branch)s-latest-%(prop:buildername)s.repo \
         && sync /packages/%(prop:branch)s/%(prop:revision)s
 """,