diff --git a/defaults/main.yml b/defaults/main.yml
index e589847..fa3a54c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,4 @@
 ---
 # defaults file for repo-epel
 epel_specify_mirror: false
-epel_mirror_url: http://download.fedoraproject.org/pub
\ No newline at end of file
+epel_mirror_url: http://download.fedoraproject.org/pub/epel
\ No newline at end of file
diff --git a/templates/el7-epel-testing.repo.j2 b/templates/el7-epel-testing.repo.j2
index e7a6649..87dc9ad 100644
--- a/templates/el7-epel-testing.repo.j2
+++ b/templates/el7-epel-testing.repo.j2
@@ -1,7 +1,7 @@
 [epel-testing]
 name=Extra Packages for Enterprise Linux 7 - Testing - $basearch
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/testing/7/$basearch
+baseurl={{ epel_mirror_url }}/testing/7/$basearch
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch
 {% endif %}
@@ -13,7 +13,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
 [epel-testing-debuginfo]
 name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Debug
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/testing/7/$basearch/debug
+baseurl={{ epel_mirror_url }}/testing/7/$basearch/debug
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch
 {% endif %}
@@ -25,7 +25,7 @@ gpgcheck=1
 [epel-testing-source]
 name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Source
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/testing/7/SRPMS
+baseurl={{ epel_mirror_url }}/testing/7/SRPMS
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch
 {% endif %}
diff --git a/templates/el7-epel.repo.j2 b/templates/el7-epel.repo.j2
index 7b88854..b0e37ca 100644
--- a/templates/el7-epel.repo.j2
+++ b/templates/el7-epel.repo.j2
@@ -1,7 +1,7 @@
 [epel]
 name=Extra Packages for Enterprise Linux 7 - $basearch
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/7/$basearch
+baseurl={{ epel_mirror_url }}/7/$basearch
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
 {% endif %}
diff --git a/templates/el8-epel-modular.repo.j2 b/templates/el8-epel-modular.repo.j2
index 577e459..aa14104 100644
--- a/templates/el8-epel-modular.repo.j2
+++ b/templates/el8-epel-modular.repo.j2
@@ -1,7 +1,7 @@
 [epel-modular]
 name=Extra Packages for Enterprise Linux Modular $releasever - $basearch
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/$releasever/Modular/$basearch
+baseurl={{ epel_mirror_url }}/$releasever/Modular/$basearch
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
@@ -13,7 +13,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 [epel-modular-debuginfo]
 name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/$releasever/Modular/$basearch/debug
+baseurl={{ epel_mirror_url }}/$releasever/Modular/$basearch/debug
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
@@ -24,7 +24,7 @@ gpgcheck=1
 [epel-modular-source]
 name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/$releasever/Modular/SRPMS
+baseurl={{ epel_mirror_url }}/$releasever/Modular/SRPMS
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
diff --git a/templates/el8-epel-playground.repo.j2 b/templates/el8-epel-playground.repo.j2
index ad4a1ad..d34c5cb 100644
--- a/templates/el8-epel-playground.repo.j2
+++ b/templates/el8-epel-playground.repo.j2
@@ -1,7 +1,7 @@
 [epel-playground]
 name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/playground/$releasever/Everything/$basearch/os
+baseurl={{ epel_mirror_url }}/playground/$releasever/Everything/$basearch/os
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
@@ -13,7 +13,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 [epel-playground-debuginfo]
 name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/playground/$releasever/Everything/$basearch/debug
+baseurl={{ epel_mirror_url }}/playground/$releasever/Everything/$basearch/debug
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
@@ -24,7 +24,7 @@ gpgcheck=1
 [epel-playground-source]
 name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/playground/$releasever/Everything/source/tree/
+baseurl={{ epel_mirror_url }}/playground/$releasever/Everything/source/tree/
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
diff --git a/templates/el8-epel-testing-modular.repo.j2 b/templates/el8-epel-testing-modular.repo.j2
index 6d5983f..91015ac 100644
--- a/templates/el8-epel-testing-modular.repo.j2
+++ b/templates/el8-epel-testing-modular.repo.j2
@@ -1,7 +1,7 @@
 [epel-testing-modular]
 name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/testing/$releasever/Modular/$basearch
+baseurl={{ epel_mirror_url }}/testing/$releasever/Modular/$basearch
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
@@ -13,7 +13,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 [epel-testing-modular-debuginfo]
 name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/testing/$releasever/Modular/$basearch/debug
+baseurl={{ epel_mirror_url }}/testing/$releasever/Modular/$basearch/debug
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
@@ -24,7 +24,7 @@ gpgcheck=1
 [epel-testing-modular-source]
 name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/testing/$releasever/Modular/SRPMS
+baseurl={{ epel_mirror_url }}/testing/$releasever/Modular/SRPMS
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
diff --git a/templates/el8-epel-testing.repo.j2 b/templates/el8-epel-testing.repo.j2
index 6374784..be3a3e8 100644
--- a/templates/el8-epel-testing.repo.j2
+++ b/templates/el8-epel-testing.repo.j2
@@ -1,7 +1,7 @@
 [epel-testing]
 name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/testing/$releasever/Everything/$basearch
+baseurl={{ epel_mirror_url }}/testing/$releasever/Everything/$basearch
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
@@ -13,7 +13,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 [epel-testing-debuginfo]
 name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/testing/$releasever/Everything/$basearch/debug
+baseurl={{ epel_mirror_url }}/testing/$releasever/Everything/$basearch/debug
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
@@ -24,7 +24,7 @@ gpgcheck=1
 [epel-testing-source]
 name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/testing/$releasever/Everything/SRPMS
+baseurl={{ epel_mirror_url }}/testing/$releasever/Everything/SRPMS
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
diff --git a/templates/el8-epel.repo.j2 b/templates/el8-epel.repo.j2
index 4ac5d96..c6402e7 100644
--- a/templates/el8-epel.repo.j2
+++ b/templates/el8-epel.repo.j2
@@ -1,7 +1,7 @@
 [epel]
 name=Extra Packages for Enterprise Linux $releasever - $basearch
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/$releasever/Everything/$basearch
+baseurl={{ epel_mirror_url }}/$releasever/Everything/$basearch
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
@@ -13,7 +13,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 [epel-debuginfo]
 name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/$releasever/Everything/$basearch/debug
+baseurl={{ epel_mirror_url }}/$releasever/Everything/$basearch/debug
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}
@@ -24,7 +24,7 @@ gpgcheck=1
 [epel-source]
 name=Extra Packages for Enterprise Linux $releasever - $basearch - Source
 {% if epel_specify_mirror is sameas true %}
-baseurl={{ epel_mirror_url }}/epel/$releasever/Everything/SRPMS
+baseurl={{ epel_mirror_url }}/$releasever/Everything/SRPMS
 {% else %}
 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir
 {% endif %}