diff --git a/pillar/osfullname/Leap.sls b/pillar/osfullname/Leap.sls
index a16e577..12cc6af 100644
--- a/pillar/osfullname/Leap.sls
+++ b/pillar/osfullname/Leap.sls
@@ -3,10 +3,10 @@
 zypper:
   repositories:
     repo-oss:
-      baseurl: http://download.infra.opensuse.org/distribution/leap/{{ osrelease }}/repo/oss/
+      baseurl: http://download.infra.opensuse.org/distribution/leap/$releasever/repo/oss/
       priority: 99
       refresh: False
     repo-update-oss:
-      baseurl: http://download.infra.opensuse.org/update/leap/{{ osrelease }}/oss/
+      baseurl: http://download.infra.opensuse.org/update/leap/$releasever/oss/
       priority: 99
       refresh: True
diff --git a/pillar/salt_cluster/opensuse/osfullname/Leap.sls b/pillar/salt_cluster/opensuse/osfullname/Leap.sls
index 8acb17b..82d56d2 100644
--- a/pillar/salt_cluster/opensuse/osfullname/Leap.sls
+++ b/pillar/salt_cluster/opensuse/osfullname/Leap.sls
@@ -1,7 +1,7 @@
 zypper:
   repositories:
     openSUSE:infrastructure:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure/openSUSE_Leap_{{ salt['grains.get']('osrelease') }}/
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure/openSUSE_Leap_$releasever/
       gpgautoimport: True
       priority: 100
       refresh: True