diff --git a/files/common/fedora-modular.repo-secondary b/files/common/fedora-modular.repo-secondary
index 1e0ee865e4..2648c509d8 100644
--- a/files/common/fedora-modular.repo-secondary
+++ b/files/common/fedora-modular.repo-secondary
@@ -1,8 +1,12 @@
 [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-secondary/releases/$releasever/Modular/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
+{% else %}
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/$basearch/os
+{% endif %}
 enabled=1
 metadata_expire=7d
 gpgcheck=1
@@ -11,8 +15,12 @@ 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-secondary/releases/$releasever/Modular/$basearch/debug/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
+{% else %}
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/$basearch/debug/tree
+{% endif %}
 enabled=0
 metadata_expire=7d
 gpgcheck=1
@@ -21,8 +29,12 @@ 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-secondary/releases/$releasever/Modular/source/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
+{% else %}
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/source/tree
+{% endif %}
 enabled=0
 metadata_expire=7d
 gpgcheck=1
diff --git a/files/common/fedora-updates-modular.repo-secondary b/files/common/fedora-updates-modular.repo-secondary
index 2c7f326248..7d235aac48 100644
--- a/files/common/fedora-updates-modular.repo-secondary
+++ b/files/common/fedora-updates-modular.repo-secondary
@@ -1,8 +1,12 @@
 [updates-modular]
 name=Fedora Modular $releasever - $basearch - Updates
 failovermethod=priority
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/$basearch/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
+{% else %}
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/$basearch
+{% endif %}
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
@@ -10,8 +14,12 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [updates-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Updates - 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-secondary/updates/$releasever/Modular/$basearch/debug/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
+{% else %}
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/$basearch/debug
+{% endif %}
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
@@ -19,8 +27,12 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [updates-modular-source]
 name=Fedora Modular $releasever - Updates 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-secondary/updates/$releasever/Modular/SRPMS/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
+{% else %}
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/SRPMS
+{% endif %}
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/files/common/fedora.repo-secondary b/files/common/fedora.repo-secondary
index d93d0ac8f5..92e64fb205 100644
--- a/files/common/fedora.repo-secondary
+++ b/files/common/fedora.repo-secondary
@@ -15,7 +15,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
 failovermethod=priority
-{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber if FedoraBranched is defined else FedoraRawhideNumber )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
 baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/debug/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 {% else %}
@@ -29,7 +29,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [fedora-source]
 name=Fedora $releasever - Source
 failovermethod=priority
-{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber if FedoraBranched is defined else FedoraRawhideNumber )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
 baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/source/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 {% else %}
diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml
index b962f54940..1422d1b6fd 100644
--- a/playbooks/groups/virthost.yml
+++ b/playbooks/groups/virthost.yml
@@ -15,8 +15,8 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
   - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base