diff --git a/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration b/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
index 21f386f2..a4d29b37 100755
--- a/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
+++ b/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
@@ -31,8 +31,8 @@ REG_METHOD="$(os-apply-config --key rh_registration.method --type raw --key-defa
 
 opts=
 attach_opts=
-repos="repos --enable rhel-7-server-rpms"
-satellite_repo="rhel-7-server-rh-common-rpms"
+repos="repos --enable rhel-${RHEL_MAJ_VER}-server-rpms"
+satellite_repo="rhel-${RHEL_MAJ_VER}-server-rh-common-rpms"
 if [ -n "${REG_AUTO_ATTACH:-}" ]; then
     opts="$opts --auto-attach"
 
diff --git a/elements/rhel-common/pre-install.d/00-rhel-registration b/elements/rhel-common/pre-install.d/00-rhel-registration
index dcb69d8f..3f0b8450 100755
--- a/elements/rhel-common/pre-install.d/00-rhel-registration
+++ b/elements/rhel-common/pre-install.d/00-rhel-registration
@@ -9,8 +9,8 @@ set -o pipefail
 
 opts=
 attach_opts=
-repos="repos --enable rhel-7-server-rpms"
-satellite_repo="rhel-7-server-rh-common-rpms"
+repos="repos --enable rhel-${RHEL_MAJ_VER}-server-rpms"
+satellite_repo="rhel-${RHEL_MAJ_VER}-server-rh-common-rpms"
 
 if [ -n "${REG_AUTO_ATTACH:-}" ]; then
     opts="$opts --auto-attach"
diff --git a/elements/rhel/environment.d/10-rhel-distro-name.bash b/elements/rhel/environment.d/10-rhel-distro-name.bash
index cf277400..9586e6ce 100644
--- a/elements/rhel/environment.d/10-rhel-distro-name.bash
+++ b/elements/rhel/environment.d/10-rhel-distro-name.bash
@@ -1 +1,2 @@
 export DISTRO_NAME=rhel
+export RHEL_MAJ_VER=6
diff --git a/elements/rhel7/environment.d/10-rhel7-distro-name.bash b/elements/rhel7/environment.d/10-rhel7-distro-name.bash
index 07578d0e..c8eb6080 100644
--- a/elements/rhel7/environment.d/10-rhel7-distro-name.bash
+++ b/elements/rhel7/environment.d/10-rhel7-distro-name.bash
@@ -1 +1,2 @@
 export DISTRO_NAME=rhel7
+export RHEL_MAJ_VER=7