diff --git a/roles/configure-mirrors/tasks/mirror/Suse.yaml b/roles/configure-mirrors/tasks/mirror/Suse.yaml
index 8b0fa06db..549ef445f 100644
--- a/roles/configure-mirrors/tasks/mirror/Suse.yaml
+++ b/roles/configure-mirrors/tasks/mirror/Suse.yaml
@@ -1,12 +1,12 @@
 - name: set zypper base package repository (openSUSE Leap)
   set_fact:
       opensuse_repo_baseurl: "{{ package_mirror }}/distribution/leap/$releasever/repo/oss/"
-  when: not ansible_distribution | search("Tumbleweed")
+  when: ansible_distribution is not search("Tumbleweed")
 
 - name: set zypper base package repository (openSUSE Tumbleweed)
   set_fact:
       opensuse_repo_baseurl: "{{ package_mirror }}/tumbleweed/repo/oss/"
-  when: ansible_distribution | search("Tumbleweed")
+  when: ansible_distribution is search("Tumbleweed")
 
 - name: Install Suse repository files
   become: yes
@@ -31,4 +31,4 @@
     src: suse/etc/zypp/repos.d/repo-update.repo.j2
   notify:
     - Update zypper cache
-  when: not ansible_distribution | search("Tumbleweed")
+  when: ansible_distribution is not search("Tumbleweed")
diff --git a/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora-updates.repo.j2 b/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora-updates.repo.j2
index b1b6f7938..64669fa63 100644
--- a/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora-updates.repo.j2
+++ b/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora-updates.repo.j2
@@ -2,7 +2,7 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
-{% if ansible_distribution_version | version_compare('28', '<') %}
+{% if ansible_distribution_version is version('28', '<') %}
 baseurl={{ package_mirror }}/updates/$releasever/$basearch/
 {% else %}
 baseurl={{ package_mirror }}/updates/$releasever/Everything/$basearch/
@@ -18,7 +18,7 @@ skip_if_unavailable=False
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
 failovermethod=priority
-{% if ansible_distribution_version | version_compare('28', '<') %}
+{% if ansible_distribution_version is version('28', '<') %}
 baseurl={{ package_mirror }}/updates/$releasever/$basearch/debug/
 {% else %}
 baseurl={{ package_mirror }}/updates/$releasever/Everything/$basearch/debug/tree/
@@ -34,7 +34,7 @@ skip_if_unavailable=False
 [updates-source]
 name=Fedora $releasever - Updates Source
 failovermethod=priority
-{% if ansible_distribution_version | version_compare('28', '<') %}
+{% if ansible_distribution_version is version('28', '<') %}
 baseurl={{ package_mirror }}/updates/$releasever/SRPMS/
 {% else %}
 baseurl={{ package_mirror }}/updates/$releasever/Everything/source/tree/