diff --git a/crb b/crb
index 32f4656..dfdd88f 100755
--- a/crb
+++ b/crb
@@ -24,10 +24,15 @@ usage() {
   echo "  disable" >&2
   echo "    Disable the CRB repo" >&2
   echo "  status" >&2
-  echo "    Show if rhe CRB repo is enabled or disabled" >&2
+  echo "    Show if the CRB repo is enabled or disabled" >&2
   echo "  help" >&2
   echo "    Show this options menu" >&2
   echo >&2
+  echo "Environment Variable:" >&2
+  echo "  FORCE_DNF=1    Set this before the command to force the use of" >&2
+  echo "                 'dnf config-manager' even on RHEL systems." >&2
+  echo "                 Example: FORCE_DNF=1 $(basename "$0") enable" >&2
+  echo >&2
   popd &>/dev/null
   exit 1
 }
@@ -51,8 +56,8 @@ enable_disable_repo(){
     crb_repo=$(dnf repolist --all | grep -i -e crb -e powertools -e codeready | grep -v -i -e debug -e source -e eus -e virt -e rhui | awk '{print $1}')
 
     # Determine if we are on RHEL or not, then do the correct steps
-    source /etc/os-release
-    if [[ "${NAME}" =~ "Red Hat" ]] ; then
+        source /etc/os-release
+    if [[ "${FORCE_DNF:-0}" -eq 0 && "${NAME}" =~ "Red Hat" ]] ; then
         subscription-manager repos ${command} ${crb_repo}
     else
         # Determine if dnf-command(config-manager) is installed
diff --git a/epel-release.spec b/epel-release.spec
index d78d98a..dfe8e5d 100644
--- a/epel-release.spec
+++ b/epel-release.spec
@@ -2,7 +2,7 @@
 ## (rpmautospec version 0.7.3)
 ## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 5;
+    release_number = 6;
     base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
     print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
@@ -89,6 +89,9 @@ fi
 
 %changelog
 ## START: Generated by rpmautospec
+* Thu Apr 17 2025 Martin Hoyer <mhoyer@redhat.com> - 10-6
+- Add FORCE_DNF option to crb script
+
 * Thu Apr 03 2025 Carl George <carlwgeorge@fedoraproject.org> - 10-5
 - Change metalinks/baseurls to new repo naming scheme
 
diff --git a/sources b/sources
new file mode 100644
index 0000000..e69de29