diff --git a/pillar/common.sls b/pillar/common.sls
index 037290d..c513a15 100644
--- a/pillar/common.sls
+++ b/pillar/common.sls
@@ -1,3 +1,4 @@
+{% set osmajorrelease = salt['grains.get']('osmajorrelease')|int %}
 {% set osrelease = salt['grains.get']('osrelease') %}
 
 chrony:
@@ -173,3 +174,11 @@ zypper:
     withlock: {}
     wget: {}
     wgetpaste: {}
+    {% if osmajorrelease > 11 %}
+    aaa_base-extras: {}
+    ca-certificates-mozilla: {}
+    htop: {}
+    mtr: {}
+    tmux: {}
+    traceroute: {}
+    {% endif %}
diff --git a/pillar/osmajorrelease/12_or_42.sls b/pillar/osmajorrelease/12_or_42.sls
deleted file mode 100644
index a96f263..0000000
--- a/pillar/osmajorrelease/12_or_42.sls
+++ /dev/null
@@ -1,10 +0,0 @@
-# this file is also included in osmajorrelease.15
-
-zypper:
-  packages:
-    aaa_base-extras: {}
-    ca-certificates-mozilla: {}
-    htop: {}
-    mtr: {}
-    tmux: {}
-    traceroute: {}
diff --git a/pillar/osmajorrelease/15.sls b/pillar/osmajorrelease/15.sls
index 454fff5..ff9105b 100644
--- a/pillar/osmajorrelease/15.sls
+++ b/pillar/osmajorrelease/15.sls
@@ -1,5 +1,4 @@
 include:
   - osmajorrelease.42
-  - osmajorrelease.12_or_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/top.sls b/pillar/top.sls
index 205ad73..f9823f8 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -43,9 +43,6 @@
   'osmajorrelease:{{ osmajorrelease }}':
     - match: grain
     - osmajorrelease.{{ osmajorrelease }}
-  'osmajorrelease:(1|4)2':
-    - match: grain_pcre
-    - osmajorrelease.12_or_42
   {% if salt_cluster in ['opensuse', 'geeko'] %}
   'salt_cluster:{{ salt_cluster }}':
     - match: grain