diff --git a/roles/bootstrap_os/defaults/main.yml b/roles/bootstrap_os/defaults/main.yml
index 63ffe4b96..f061a6fa8 100644
--- a/roles/bootstrap_os/defaults/main.yml
+++ b/roles/bootstrap_os/defaults/main.yml
@@ -20,6 +20,10 @@ openeuler_metalink_enabled: false
 # Install public repo on Oracle Linux
 use_oracle_public_repo: true
 
+## RHEL specific variables
+# Enable RHEL subscription repos
+rhel_enable_repos: true
+
 ## Ubuntu specific variables
 # Disable unattended-upgrades for Linux kernel and all packages start with linux- on Ubuntu
 ubuntu_kernel_unattended_upgrades_disabled: false
diff --git a/roles/bootstrap_os/tasks/centos.yml b/roles/bootstrap_os/tasks/centos.yml
index 02cc429f0..4551a6d05 100644
--- a/roles/bootstrap_os/tasks/centos.yml
+++ b/roles/bootstrap_os/tasks/centos.yml
@@ -23,7 +23,7 @@
     name: "oracle-epel-release-el{{ ansible_distribution_major_version }}"
     state: present
   when:
-    - use_oracle_public_repo | default(true)
+    - use_oracle_public_repo
     - '''ID="ol"'' in os_release.stdout_lines'
     - (ansible_distribution_version | float) >= 7.6
 
@@ -39,7 +39,7 @@
     - { option: "enabled", value: "1" }
     - { option: "baseurl", value: "http://yum.oracle.com/repo/OracleLinux/OL{{ ansible_distribution_major_version }}/addons/$basearch/" }
   when:
-    - use_oracle_public_repo | default(true)
+    - use_oracle_public_repo
     - '''ID="ol"'' in os_release.stdout_lines'
     - (ansible_distribution_version | float) >= 7.6
 
@@ -56,7 +56,7 @@
     - { option: "gpgcheck", value: "0" }
     - { option: "baseurl", value: "http://mirror.centos.org/centos/{{ ansible_distribution_major_version }}/extras/$basearch/os/" }
   when:
-    - use_oracle_public_repo | default(true)
+    - use_oracle_public_repo
     - '''ID="ol"'' in os_release.stdout_lines'
     - (ansible_distribution_version | float) >= 7.6
     - (ansible_distribution_version | float) < 9
diff --git a/roles/bootstrap_os/tasks/rhel.yml b/roles/bootstrap_os/tasks/rhel.yml
index adfbb1a7f..85a7785c4 100644
--- a/roles/bootstrap_os/tasks/rhel.yml
+++ b/roles/bootstrap_os/tasks/rhel.yml
@@ -69,7 +69,7 @@
     name:
       - "rhel-8-for-*-baseos-rpms"
       - "rhel-8-for-*-appstream-rpms"
-    state: "{{ 'enabled' if (rhel_enable_repos | default(True) | bool) else 'disabled' }}"
+    state: "{{ 'enabled' if (rhel_enable_repos | bool) else 'disabled' }}"
   when:
     - ansible_distribution_major_version == "8"
     - (not rh_subscription_status.changed) or (rh_subscription_username is defined) or (rh_subscription_org_id is defined)