diff --git a/files/common/fedora-modular.repo b/files/common/fedora-modular.repo
index a10ec816df..75eee3567c 100644
--- a/files/common/fedora-modular.repo
+++ b/files/common/fedora-modular.repo
@@ -1,7 +1,7 @@
 [fedora-modular]
 name=Fedora Modular $releasever - $basearch
 failovermethod=priority
-{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True 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/
@@ -15,7 +15,7 @@ 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 )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True 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/
@@ -29,7 +29,7 @@ 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 )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True 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/
diff --git a/files/common/fedora-modular.repo-secondary b/files/common/fedora-modular.repo-secondary
index 2648c509d8..449974d09d 100644
--- a/files/common/fedora-modular.repo-secondary
+++ b/files/common/fedora-modular.repo-secondary
@@ -1,7 +1,7 @@
 [fedora-modular]
 name=Fedora Modular $releasever - $basearch
 failovermethod=priority
-{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True 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 %}
@@ -15,7 +15,7 @@ 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 )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True 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 %}
@@ -29,7 +29,7 @@ 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 )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True 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 %}
diff --git a/files/common/fedora-updates-modular.repo-secondary b/files/common/fedora-updates-modular.repo-secondary
index 7d235aac48..15ed391ee0 100644
--- a/files/common/fedora-updates-modular.repo-secondary
+++ b/files/common/fedora-updates-modular.repo-secondary
@@ -1,7 +1,7 @@
 [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 )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True 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 %}
@@ -14,7 +14,7 @@ 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 )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True 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 %}
@@ -27,7 +27,7 @@ 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 )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True 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 %}
diff --git a/files/common/fedora.repo b/files/common/fedora.repo
index 6fc77563ed..7ae2212d56 100644
--- a/files/common/fedora.repo
+++ b/files/common/fedora.repo
@@ -1,7 +1,7 @@
 [fedora]
 name=Fedora $releasever - $basearch
 failovermethod=priority
-{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True else FedoraRawhideNumber|int )  %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 {% else %}
@@ -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|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True else FedoraRawhideNumber|int )  %}
 baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 {% else %}
diff --git a/files/common/fedora.repo-secondary b/files/common/fedora.repo-secondary
index 92e64fb205..89f17eff12 100644
--- a/files/common/fedora.repo-secondary
+++ b/files/common/fedora.repo-secondary
@@ -1,7 +1,7 @@
 [fedora]
 name=Fedora $releasever - $basearch
 failovermethod=priority
-{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True else FedoraRawhideNumber|int )  %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 {% else %}
@@ -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|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True 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|int if FedoraBranched is defined else FedoraRawhideNumber|int )  %}
+{% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched is True 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 %}