diff --git a/pillar/osfullname/Leap.sls b/pillar/osfullname/Leap.sls
index b2e1876..a16e577 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/{{ osrelease }}/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/{{ osrelease }}/oss/
       priority: 99
       refresh: True
diff --git a/pillar/osmajorrelease/11.sls b/pillar/osmajorrelease/11.sls
index 3b83ffb..cbec9f9 100644
--- a/pillar/osmajorrelease/11.sls
+++ b/pillar/osmajorrelease/11.sls
@@ -3,18 +3,18 @@
 zypper:
   repositories:
     SLE-SDK:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLE11-SDK-SP{{ osminorrelease }}-Pool/sle-11-x86_64
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLE11-SDK-SP{{ osminorrelease }}-Pool/sle-11-x86_64/
       priority: 99
       refresh: False
     SLE-SDK-Update:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLE11-SDK-SP{{ osminorrelease }}-Updates/sle-11-x86_64
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLE11-SDK-SP{{ osminorrelease }}-Updates/sle-11-x86_64/
       priority: 99
       refresh: True
     SLE-SERVER:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLES11-SP{{ osminorrelease }}-Pool/sle-11-x86_64
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLES11-SP{{ osminorrelease }}-Pool/sle-11-x86_64/
       priority: 99
       refresh: False
     SLE-SERVER-Update:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLES11-SP{{ osminorrelease }}-Updates/sle-11-x86_64
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SLES11-SP{{ osminorrelease }}-Updates/sle-11-x86_64/
       priority: 99
       refresh: True
diff --git a/pillar/osmajorrelease/12.sls b/pillar/osmajorrelease/12.sls
index ba50ad2..580f924 100644
--- a/pillar/osmajorrelease/12.sls
+++ b/pillar/osmajorrelease/12.sls
@@ -8,42 +8,42 @@
 zypper:
   repositories:
     SLE-HA:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-HA/{{ version }}/x86_64/product
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-HA/{{ version }}/x86_64/product/
       priority: 99
       refresh: False
     SLE-HA-Update:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-HA/{{ version }}/x86_64/update
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-HA/{{ version }}/x86_64/update/
       priority: 99
       refresh: True
     SLE-Module-Adv-Systems-Management:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Adv-Systems-Management/12/x86_64/product
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Adv-Systems-Management/12/x86_64/product/
       priority: 99
       refresh: False
     SLE-Module-Adv-Systems-Management-Update:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Adv-Systems-Management/12/x86_64/update
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Adv-Systems-Management/12/x86_64/update/
       priority: 99
       refresh: True
     SLE-Module-Web-Scripting:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Web-Scripting/12/x86_64/product
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Web-Scripting/12/x86_64/product/
       priority: 99
       refresh: False
     SLE-Module-Web-Scripting-Update:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Web-Scripting/12/x86_64/update
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Web-Scripting/12/x86_64/update/
       priority: 99
       refresh: True
     SLE-SDK:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-SDK/{{ version }}/x86_64/product
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-SDK/{{ version }}/x86_64/product/
       priority: 99
       refresh: False
     SLE-SDK-Update:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SDK/{{ version }}/x86_64/update
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SDK/{{ version }}/x86_64/update/
       priority: 99
       refresh: True
     SLE-SERVER:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-SERVER/{{ version }}/x86_64/product
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Products/SLE-SERVER/{{ version }}/x86_64/product/
       priority: 99
       refresh: False
     SLE-SERVER-Update:
-      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SERVER/{{ version }}/x86_64/update
+      baseurl: http://smt-internal.infra.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SERVER/{{ version }}/x86_64/update/
       priority: 99
       refresh: True
diff --git a/pillar/role/common/wiki.sls b/pillar/role/common/wiki.sls
index 0047744..00bd152 100644
--- a/pillar/role/common/wiki.sls
+++ b/pillar/role/common/wiki.sls
@@ -8,7 +8,7 @@ sudoers:
 zypper:
   repositories:
     openSUSE:infrastructure:wiki:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/wiki/openSUSE_Leap_{{ salt['grains.get']('osrelease') }}
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/wiki/openSUSE_Leap_{{ salt['grains.get']('osrelease') }}/
       gpgcheck: 0
       priority: 100
       refresh: True
diff --git a/pillar/salt_cluster/opensuse/osfullname/Leap.sls b/pillar/salt_cluster/opensuse/osfullname/Leap.sls
index b1d07c3..8acb17b 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_{{ salt['grains.get']('osrelease') }}/
       gpgautoimport: True
       priority: 100
       refresh: True
diff --git a/pillar/salt_cluster/opensuse/osfullname/SLES.sls b/pillar/salt_cluster/opensuse/osfullname/SLES.sls
index b5f9b48..be3d653 100644
--- a/pillar/salt_cluster/opensuse/osfullname/SLES.sls
+++ b/pillar/salt_cluster/opensuse/osfullname/SLES.sls
@@ -8,7 +8,7 @@
 zypper:
   repositories:
     openSUSE:infrastructure:
-      baseurl: https://download.infra.opensuse.org/repositories/openSUSE:/infrastructure/SLE_{{ version }}
+      baseurl: https://download.infra.opensuse.org/repositories/openSUSE:/infrastructure/SLE_{{ version }}/
       gpgautoimport: True
       priority: 100
       refresh: True