diff --git a/ansible/roles/dnf/tasks/local-mirror.yml b/ansible/roles/dnf/tasks/local-mirror.yml
index 405b5c83a..afc636390 100644
--- a/ansible/roles/dnf/tasks/local-mirror.yml
+++ b/ansible/roles/dnf/tasks/local-mirror.yml
@@ -38,9 +38,11 @@
   loop:
     - epel.repo
     - epel-modular.repo
+  when: dnf_install_epel | bool
 
 - name: Update cache
   dnf:
     name: []
     update_cache: yes
   become: True
+  when: dnf_install_epel | bool
diff --git a/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2
index 057d8e8bd..7ffe1ef65 100644
--- a/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2
+++ b/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2
@@ -103,8 +103,6 @@ dnf_custom_repos:
     baseurl: http://packages.treasuredata.com/3/redhat/$releasever/$basearch
     gpgkey: https://packages.treasuredata.com/GPG-KEY-td-agent
     gpgcheck: yes
-# Don't install EPEL repositories.
-dnf_install_epel: false
 # Enable DNF Automatic.
 dnf_automatic_enabled: true
 {% endif %}