diff --git a/repos/Makefile b/repos/Makefile
index 63e2f7f..18c7605 100644
--- a/repos/Makefile
+++ b/repos/Makefile
@@ -3,6 +3,7 @@ repos: $(_REPO_FILES)
 # Step 2: Replace vars in repo files
 %.repo: /etc/yum.repos.d/%.repo
 	cp /etc/yum.repos.d/$*.repo           $*.repo
+	$(if $(findstring redhat,$*),sed -i "s/rhel8/rhel$(word 1,$(subst ., ,$(VERSION)))/g" $*.repo)
 	sed -i "s/\$$releasever/$(VERSION)/g" $*.repo
 	sed -i "s/\$$basearch/$(ARCH)/g"      $*.repo