diff --git a/pillar/osfullname/Leap.sls b/pillar/osfullname/Leap.sls
index b0b0bf7..7ddc670 100644
--- a/pillar/osfullname/Leap.sls
+++ b/pillar/osfullname/Leap.sls
@@ -1,4 +1,23 @@
+limits:
+  users:
+    '*':
+      - limit_type: hard
+        limit_item: nproc
+        limit_value: 1700
+      - limit_type: soft
+        limit_item: nproc
+        limit_value: 1200
+    root:
+      - limit_type: hard
+        limit_item: nproc
+        limit_value: 3000
+      - limit_type: soft
+        limit_item: nproc
+        limit_value: 1850
+
 zypper:
+  packages:
+    mlocate: {}
   repositories:
     repo-oss:
       baseurl: http://download.infra.opensuse.org/distribution/leap/$releasever/repo/oss/
diff --git a/pillar/osfullname/SLES.sls b/pillar/osfullname/SLES.sls
index 792d600..a97cf35 100644
--- a/pillar/osfullname/SLES.sls
+++ b/pillar/osfullname/SLES.sls
@@ -1 +1,4 @@
-#
+{% set osmajorrelease = salt['grains.get']('osmajorrelease')|int %}
+
+include:
+  - SLES.{{ osmajorrelease }}
diff --git a/pillar/osfullname/SLES/11.sls b/pillar/osfullname/SLES/11.sls
new file mode 100644
index 0000000..cbec9f9
--- /dev/null
+++ b/pillar/osfullname/SLES/11.sls
@@ -0,0 +1,20 @@
+{% set osminorrelease = salt['grains.get']('osrelease_info')[1]|string %}
+
+zypper:
+  repositories:
+    SLE-SDK:
+      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/
+      priority: 99
+      refresh: True
+    SLE-SERVER:
+      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/
+      priority: 99
+      refresh: True
diff --git a/pillar/osfullname/SLES/12.sls b/pillar/osfullname/SLES/12.sls
new file mode 100644
index 0000000..580f924
--- /dev/null
+++ b/pillar/osfullname/SLES/12.sls
@@ -0,0 +1,49 @@
+{% set osrelease_info = salt['grains.get']('osrelease_info') %}
+
+{% set version = osrelease_info[0]|string %}
+{% if osrelease_info|length == 2 %}
+    {% set version = version + '-SP' + osrelease_info[1]|string %}
+{% endif %}
+
+zypper:
+  repositories:
+    SLE-HA:
+      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/
+      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/
+      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/
+      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/
+      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/
+      priority: 99
+      refresh: True
+    SLE-SDK:
+      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/
+      priority: 99
+      refresh: True
+    SLE-SERVER:
+      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/
+      priority: 99
+      refresh: True
diff --git a/pillar/osfullname/openSUSE_Tumbleweed.sls b/pillar/osfullname/openSUSE_Tumbleweed.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/osfullname/openSUSE_Tumbleweed.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/osmajorrelease/11.sls b/pillar/osmajorrelease/11.sls
deleted file mode 100644
index cbec9f9..0000000
--- a/pillar/osmajorrelease/11.sls
+++ /dev/null
@@ -1,20 +0,0 @@
-{% set osminorrelease = salt['grains.get']('osrelease_info')[1]|string %}
-
-zypper:
-  repositories:
-    SLE-SDK:
-      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/
-      priority: 99
-      refresh: True
-    SLE-SERVER:
-      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/
-      priority: 99
-      refresh: True
diff --git a/pillar/osmajorrelease/12.sls b/pillar/osmajorrelease/12.sls
deleted file mode 100644
index 580f924..0000000
--- a/pillar/osmajorrelease/12.sls
+++ /dev/null
@@ -1,49 +0,0 @@
-{% set osrelease_info = salt['grains.get']('osrelease_info') %}
-
-{% set version = osrelease_info[0]|string %}
-{% if osrelease_info|length == 2 %}
-    {% set version = version + '-SP' + osrelease_info[1]|string %}
-{% endif %}
-
-zypper:
-  repositories:
-    SLE-HA:
-      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/
-      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/
-      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/
-      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/
-      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/
-      priority: 99
-      refresh: True
-    SLE-SDK:
-      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/
-      priority: 99
-      refresh: True
-    SLE-SERVER:
-      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/
-      priority: 99
-      refresh: True
diff --git a/pillar/osmajorrelease/15.sls b/pillar/osmajorrelease/15.sls
deleted file mode 100644
index ff9105b..0000000
--- a/pillar/osmajorrelease/15.sls
+++ /dev/null
@@ -1,4 +0,0 @@
-include:
-  - osmajorrelease.42
-
-# TODO: once we get rid of SLE 11, move the content of the above includes to common.sls and/or osfullname.Leap
diff --git a/pillar/osmajorrelease/42.sls b/pillar/osmajorrelease/42.sls
deleted file mode 100644
index e49a2d6..0000000
--- a/pillar/osmajorrelease/42.sls
+++ /dev/null
@@ -1,22 +0,0 @@
-# this file is also included in osmajorrelease.15
-
-limits:
-  users:
-    '*':
-      - limit_type: hard
-        limit_item: nproc
-        limit_value: 1700
-      - limit_type: soft
-        limit_item: nproc
-        limit_value: 1200
-    root:
-      - limit_type: hard
-        limit_item: nproc
-        limit_value: 3000
-      - limit_type: soft
-        limit_item: nproc
-        limit_value: 1850
-
-zypper:
-  packages:
-    mlocate: {}
diff --git a/pillar/osmajorrelease/8.sls b/pillar/osmajorrelease/8.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/osmajorrelease/8.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/salt_cluster/opensuse/osfullname/openSUSE_Tumbleweed.sls b/pillar/salt_cluster/opensuse/osfullname/openSUSE_Tumbleweed.sls
new file mode 100644
index 0000000..546eeb8
--- /dev/null
+++ b/pillar/salt_cluster/opensuse/osfullname/openSUSE_Tumbleweed.sls
@@ -0,0 +1,7 @@
+zypper:
+  repositories:
+    openSUSE:infrastructure:
+      baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/openSUSE_Tumbleweed/
+      gpgautoimport: True
+      priority: 100
+      refresh: True
diff --git a/pillar/top.sls b/pillar/top.sls
index 89a2d02..15b65d9 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,6 +1,5 @@
 {% set id = salt['grains.get']('id') %}
 {% set osfullname = salt['grains.get']('osfullname') %}
-{% set osmajorrelease = salt['grains.get']('osmajorrelease') %}
 {% set roles = salt['grains.get']('roles', []) %}
 {% set salt_cluster = salt['grains.get']('salt_cluster') %}
 {% set virtual = salt['grains.get']('virtual') %}
@@ -21,9 +20,6 @@
   'osfullname:{{ osfullname }}':
     - match: grain
     - osfullname.{{ osfullname.replace(' ', '_') }}
-  'osmajorrelease:{{ osmajorrelease }}':
-    - match: grain
-    - osmajorrelease.{{ osmajorrelease }}
   {% if salt_cluster in ['opensuse', 'geeko'] %}
   'salt_cluster:{{ salt_cluster }}':
     - match: grain