diff --git a/files/common/fedora-infra-tags.repo b/files/common/fedora-infra-tags.repo
new file mode 100644
index 0000000000..2f5d4cc26c
--- /dev/null
+++ b/files/common/fedora-infra-tags.repo
@@ -0,0 +1,6 @@
+[infrastructure-tags]
+name=Fedora Infrastructure tag $releasever - $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/infra/f$releasever-infra/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS
diff --git a/files/common/rhel-infra-tags.repo b/files/common/rhel-infra-tags.repo
new file mode 100644
index 0000000000..1d563c4955
--- /dev/null
+++ b/files/common/rhel-infra-tags.repo
@@ -0,0 +1,6 @@
+[infrastructure-tags]
+name=Fedora Infrastructure tag $releasever - $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/infra/epel$releasever-infra/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/repo/RPM-GPG-KEY-INFRASTRUCTURE
diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
index 174cc98cf7..772e44d0f4 100644
--- a/tasks/yumrepos.yml
+++ b/tasks/yumrepos.yml
@@ -56,3 +56,19 @@
   - config
   - packages
   - yumrepos
+
+- name: add infrastructure tags repo - RHEL
+  copy: src="{{ files }}/common/rhel-infra-tags.repo" dest="/etc/yum.repos.d/{{ item }}"
+  when: ansible_distribution == 'RedHat'
+  tags:
+  - config
+  - packages
+  - yumrepos
+
+- name: add infrastructure tags repo - Fedora
+  copy: src="{{ files }}/common/fedora-infra-tags.repo" dest="/etc/yum.repos.d/{{ item }}"
+  when: ansible_distribution == 'Fedora'
+  tags:
+  - config
+  - packages
+  - yumrepos