diff --git a/salt/default/avahi.sls b/salt/default/avahi.sls
index 22126bee2..df08f4d24 100644
--- a/salt/default/avahi.sls
+++ b/salt/default/avahi.sls
@@ -4,7 +4,7 @@ include:
 {% if grains['use_avahi'] and grains.get('osmajorrelease', None) != None %}
 
 # TODO: remove the following state when fix to bsc#1163683 is applied to all the SLES <= SLES15SP4
-{% if grains['osfullname'] == 'SLES' and grains['osrelease'] != '15.5' %}
+{% if (grains['osfullname'] == 'SLES' and grains['osrelease'] != '15.5') or (grains['osfullname'] == 'Leap') %}
 custom_avahi_repo:
   pkgrepo.managed:
     - humanname: custom_avahi_repo
@@ -26,6 +26,8 @@ custom_avahi_repo:
     - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.7/SLE_15_SP3/
     {% elif grains['osrelease'] == '15.4' %}
     - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.8/15.4/
+    {% elif grains['osrelease'] == '15.5' and grains['osfullname'] == 'Leap' %}
+    - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.8/15.5/
     {% endif %}
     - enabled: True
     - refresh: True