diff --git a/scripts/setup-rh b/scripts/setup-rh
index c67640b51..257df96c0 100755
--- a/scripts/setup-rh
+++ b/scripts/setup-rh
@@ -23,12 +23,15 @@ if [ "$(id -u)" != "0" ]; then
 fi
 
 echo "Enabling any required repos"
-if grep -q "^CentOS" /etc/redhat-release 2>/dev/null; then
+if grep -q "^Red Hat Enterprise Linux release 8" /etc/redhat-release 2>/dev/null; then
+    ARCH=$(/bin/arch)
+    subscription-manager repos --enable "codeready-builder-for-rhel-8-${ARCH}-rpms"
+elif grep -q "^CentOS" /etc/redhat-release 2>/dev/null; then
     dnf config-manager --set-enabled PowerTools
 fi
 
 echo "Installing packages required to build Mentor Embedded Linux Flex OS"
-dnf install "$@" $packages || {
+dnf install --assumeyes "$@" $packages || {
     echo >&2 "Error installing our required packages, aborting"
     exit 1
 }