diff --git a/base/init.sls b/base/init.sls
index 8e59a8b..601559a 100644
--- a/base/init.sls
+++ b/base/init.sls
@@ -3,7 +3,8 @@
 ---
 
 include:
-  - sysctl
   - .packages
   - .pki
-  - ceph.repo
+  - sysctl
+  - prometheus
+  - rsyslog
diff --git a/base/packages/common.sls b/base/packages/common.sls
index 0aeaf0f..98d43a4 100644
--- a/base/packages/common.sls
+++ b/base/packages/common.sls
@@ -50,3 +50,6 @@ common-removed:
     - pkgs:
       - atop
       - sysbench
+      - exim4-base
+      - exim4-config
+      - exim4-daemon-light
diff --git a/base/packages/openhab2.sls b/base/packages/openhab2.sls
index a8f5ed0..4ec6b7c 100644
--- a/base/packages/openhab2.sls
+++ b/base/packages/openhab2.sls
@@ -7,6 +7,9 @@ openhab2-pkgs:
    - pkgs:
      - openhab2
      - openhab2-addons
+     - default-jre-headless
+     - libopenzwave1.5
+     - nginx
    - require:
      - pkgrepo: repo_openhab2
 
@@ -19,8 +22,8 @@ repo_openhab2:
     - clean_file: True
 
 
-apt-update-repo_openhab2:
-  cmd.run:
-    - name: apt update -y
-    - listen:
-      - pkgrepo: repo_openhab2
+#apt-update-repo_openhab2:
+#  cmd.run:
+#    - name: apt update -y
+#    - listen:
+#      - pkgrepo: repo_openhab2
diff --git a/base/packages/repo/maketank.sls b/base/packages/repo/maketank.sls
index 38db240..3a4d8c5 100644
--- a/base/packages/repo/maketank.sls
+++ b/base/packages/repo/maketank.sls
@@ -11,8 +11,8 @@ repo_maketank:
     - clean_file: True
 
 
-apt-update:
-  cmd.run:
-    - name: apt update -y
-    - listen:
-      - pkgrepo: repo_maketank
+#apt-update:
+#  cmd.run:
+#    - name: apt update -y
+#    - listen:
+#      - pkgrepo: repo_maketank
diff --git a/top.sls b/top.sls
index 7c689cb..d651a6c 100644
--- a/top.sls
+++ b/top.sls
@@ -4,18 +4,22 @@
 
 base:
   '*':
-    - base 
-  'osarch:arm64 or osarch:armhf or osarch:armel':
-    - match: grain
+    - base
+  'tumor*':
+    - base.pki.ca
+  'G@osarch:arm64 or G@osarch:armhf or G@osarch:armel':
+    - match: compound
     - base.packages.arch.arm
   'riot01*':
     - haproxy
     - prometheus
     - grafana
-    #- kubernetes
-  'tumor*':
-    - base.pki.ca
-
+  'pine03':
+    - base.packages.openhab2
+  #'pine*':
+  #  - kubernetes
+  #'kube*':
+  #  - kubernetes
   #'ebin*':
   #  - ceph
   #  - ceph.osd