diff --git a/playbooks/manual/epel-minor-release/koji-release-tags.yml b/playbooks/manual/epel-minor-release/koji-release-tags.yml
index 8354bcf859..140d6b2031 100644
--- a/playbooks/manual/epel-minor-release/koji-release-tags.yml
+++ b/playbooks/manual/epel-minor-release/koji-release-tags.yml
@@ -36,17 +36,6 @@
           - 'release_minor|int > 0'
         fail_msg: The release value is not a valid version.
 
-    - name: Create external repos for EPEL minor release
-      ktdreyer.koji_ansible.koji_external_repo:
-        koji: "{{ koji_profile }}"
-        name: "{{ item.name }}"
-        url: "{{ item.url }}"
-        state: present
-      loop:
-        - {'name': 'el{{ release }}-baseos', 'url': 'https://infrastructure.fedoraproject.org/repo/centos/centos-10/BaseOS/$arch/os/'}
-        - {'name': 'el{{ release }}-appstream', 'url': 'https://infrastructure.fedoraproject.org/repo/centos/centos-10/AppStream/$arch/os/'}
-        - {'name': 'el{{ release }}-crb', 'url': 'https://infrastructure.fedoraproject.org/repo/centos/centos-10/CRB/$arch/os/'}
-
     - name: Add main tag for EPEL minor release
       ktdreyer.koji_ansible.koji_tag:
         koji: "{{ koji_profile }}"
@@ -54,23 +43,32 @@
         arches: "{{ primary_arches }}"
         state: present
         external_repos:
-          - repo: "el{{ release }}-baseos"
+          - repo: "c{{ release_major }}-baseos"
             priority: 10
-          - repo: "el{{ release }}-appstream"
+          - repo: "c{{ release_major }}-appstream"
             priority: 20
-          - repo: "el{{ release }}-crb"
+          - repo: "c{{ release_major }}-crb"
             priority: 30
 
-    - name: Fix external repos for EPEL old release
-      ktdreyer.koji_ansible.koji_external_repo:
-        koji: "{{ koji_profile }}"
-        name: "{{ item.name }}"
-        url: "{{ item.url }}"
-        state: present
+    - name: Remove external repos from the old release base tag
+      ansible.builtin.command: koji --profile {{ koji_profile }} remove-external-repo {{ item }} epel{{ old_release }}-base
+      changed_when: true
       loop:
-        - {'name': 'el{{ old_release }}-baseos', 'url': 'https://infrastructure.fedoraproject.org/repo/centos/centos-10-snapshot/BaseOS/$arch/os/'}
-        - {'name': 'el{{ old_release }}-appstream', 'url': 'https://infrastructure.fedoraproject.org/repo/centos/centos-10-snapshot/AppStream/$arch/os/'}
-        - {'name': 'el{{ old_release }}-crb', 'url': 'https://infrastructure.fedoraproject.org/repo/centos/centos-10-snapshot/CRB/$arch/os/'}
+        - c{{ release_major }}-baseos
+        - c{{ release_major }}-appstream
+        - c{{ release_major }}-crb
+
+    - name: Add snapshot external repos to the old release base tag
+      ktdreyer.koji_ansible.koji_tag:
+        koji: "{{ koji_profile }}"
+        name: "epel{{ old_release }}-base"
+        external_repos:
+          - repo: "c{{ release_major }}-snapshot-baseos"
+            priority: 10
+          - repo: "c{{ release_major }}-snapshot-appstream"
+            priority: 20
+          - repo: "c{{ release_major }}-snapshot-crb"
+            priority: 30
 
     - name: Clone EPEL old release tag into the new release
       ansible.builtin.command: koji --profile {{ koji_profile }} clone-tag --all --latest-only epel{{ old_release }} epel{{ release }}