diff --git a/files/common/rhel-8-aarch64-server-rpms.repo b/files/common/rhel-8-aarch64-server-rpms.repo
new file mode 100644
index 0000000000..a24f9870de
--- /dev/null
+++ b/files/common/rhel-8-aarch64-server-rpms.repo
@@ -0,0 +1,19 @@
+[rhel8-beta-dvd]
+name = rhel8 beta base dvd
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel-8.0-beta-1-$basearch/
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+
+[rhel8-beta-BaseOS]
+name = rhel8 beta BaseOS $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel8-beta/aarch64/rhel-8-for-aarch64-baseos-beta-rpms
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+
+[rhel8-beta-ha]
+name = rhel8 beta ha $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel8-beta/aarch64/rhel-8-for-aarch64-ha-beta-rpms
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+
+[rhel8-beta-appstream]
+name = rhel8 beta appstream $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel8-beta/aarch64/rhel-8-for-aarch64-appstream-beta-rpms
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
index f658ceb903..2ea6ab38db 100644
--- a/tasks/yumrepos.yml
+++ b/tasks/yumrepos.yml
@@ -81,7 +81,15 @@
 
 - name: add aarch64 server rpms repo
   copy: src="{{ files }}/common/rhel-7-aarch64-server-rpms.repo" dest="/etc/yum.repos.d/rhel-7-aarch64-server-rpms.repo"
-  when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and inventory_hostname.startswith('aarch64-c')
+  when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and inventory_hostname.startswith('aarch64-c') and ansible_distribution_major_version = 7
+  tags:
+  - config
+  - packages
+  - yumrepos
+
+- name: add aarch64 server rpms repo
+  copy: src="{{ files }}/common/rhel-8-aarch64-server-rpms.repo" dest="/etc/yum.repos.d/rhel-8-aarch64-server-rpms.repo"
+  when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and inventory_hostname.startswith('aarch64-c') and ansible_distribution_major_version = 8
   tags:
   - config
   - packages