diff --git a/inventory/group_vars/moonshot b/inventory/group_vars/moonshot
index 293f91a2d0..ed97d539c0 100644
--- a/inventory/group_vars/moonshot
+++ b/inventory/group_vars/moonshot
@@ -1,2 +1 @@
 ---
-use_default_epel: false
diff --git a/roles/virthost/files/rhel7-aarch64extras.repo b/roles/virthost/files/rhel7-aarch64extras.repo
deleted file mode 100644
index d316b196e2..0000000000
--- a/roles/virthost/files/rhel7-aarch64extras.repo
+++ /dev/null
@@ -1,14 +0,0 @@
-[rhel7-aarch64-extras]
-name=Extra bits that don't currently ship in RHELSA 7.2
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/aarch64-virt/
-enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-gpgcheck=0
-
-[epel]
-name=Extras Packages for Enterprise Linux $releasever - x86_64
-baseurl=http://infrastructure.fedoraproject.org/pub/epel/7/x86_64/
-enabled=1
-gpgcheck=1
-gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
-
diff --git a/roles/virthost/files/rhel7-rhev-aarch64.repo b/roles/virthost/files/rhel7-rhev-aarch64.repo
new file mode 100644
index 0000000000..ccd2a88513
--- /dev/null
+++ b/roles/virthost/files/rhel7-rhev-aarch64.repo
@@ -0,0 +1,6 @@
+[rhel-7-server-rhv-4-aarch64]
+name=rhel7 os $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-kvm-rpms
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck=1
diff --git a/roles/virthost/tasks/main.yml b/roles/virthost/tasks/main.yml
index 21d597d216..94f159bb5e 100644
--- a/roles/virthost/tasks/main.yml
+++ b/roles/virthost/tasks/main.yml
@@ -21,18 +21,18 @@
   - rhel7-os-repo
   when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 and ansible_architecture == 'x86_64'
 
-- name: install RHEV for el7 repo file
+- name: install RHEV/ppc64le for el7 repo file
   copy: src=rhel7-rhev-ppc64le.repo dest=/etc/yum.repos.d/rhel7-rhev-ppc64le.repo
   tags:
   - repos
   - rhel7-rhev-ppc64le
   when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 and ansible_architecture == 'ppc64le'
 
-- name: install virt repo for el7 aarch64 file
-  copy: src=rhel7-aarch64extras.repo dest=/etc/yum.repos.d/rhel7-aarch64extras.repo
+- name: install RHEV/aarch64 for el7 repo file
+  copy: src=rhel7-rhev-aarch64.repo dest=/etc/yum.repos.d/rhel7-rhev-aarch64.repo
   tags:
   - repos
-  - rhel7-rhev-ppc64le
+  - rhel7-rhev-aarch64
   when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 and ansible_architecture == 'aarch64'
 
 - name: install libvirt packages on rhel7 virthosts