diff --git a/files/common/fedora-modular.repo b/files/common/fedora-modular.repo
index 4ad17c95ab..a10ec816df 100644
--- a/files/common/fedora-modular.repo
+++ b/files/common/fedora-modular.repo
@@ -1,7 +1,11 @@
 [fedora-modular]
 name=Fedora Modular $releasever - $basearch
 failovermethod=priority
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
+{% else %}
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/$basearch/os/
+{% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
 enabled=1
 metadata_expire=7d
@@ -11,7 +15,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [fedora-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Debug
 failovermethod=priority
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
+{% else %}
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/$basearch/debug/tree/
+{% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -21,7 +29,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [fedora-modular-source]
 name=Fedora Modular $releasever - Source
 failovermethod=priority
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
+{% else %}
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/source/tree/
+{% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d