diff --git a/base/hostconfig/auto02.sls b/base/hostconfig/auto02.sls
index 094de39..737ecc9 100644
--- a/base/hostconfig/auto02.sls
+++ b/base/hostconfig/auto02.sls
@@ -156,7 +156,7 @@ haproxy:
         - location /lovelace if deprecated
       servers:
         server1:
-          name: auto02
+          name: auto
           host: 127.0.0.1
           port: 8123
           check: check
@@ -165,7 +165,7 @@ haproxy:
       balance: roundrobin
       servers:
         server1:
-          name: auto02
+          name: auto-conf
           host: 127.0.0.1
           port: 3218
           check: check
@@ -174,7 +174,7 @@ haproxy:
       balance: roundrobin
       servers:
         server1:
-          name: auto02
+          name: zwave2mqtt
           host: 127.0.0.1
           port: 8091
           check: check
@@ -183,7 +183,7 @@ haproxy:
       balance: roundrobin
       servers:
         server1:
-          name: auto02
+          name: pihole
           host: 127.0.0.1
           port: 8080
           check: check
@@ -192,7 +192,7 @@ haproxy:
       balance: roundrobin
       servers:
         server1:
-          name: auto02
+          name: nodered
           host: 127.0.0.1
           port: 1880
           check: check
diff --git a/base/hostconfig/init.sls b/base/hostconfig/init.sls
index 8f9f0db..7f7cbce 100644
--- a/base/hostconfig/init.sls
+++ b/base/hostconfig/init.sls
@@ -1,4 +1,5 @@
 
 include:
+  - base.hostconfig.{{ grains.get('nodename') | regex_replace('[0-9]', '', ignorecase=True) }}
   - base.hostconfig.{{ grains.get('nodename') }}
- 
\ No newline at end of file
+   
diff --git a/base/hostconfig/pine.sls b/base/hostconfig/pine.sls
new file mode 100644
index 0000000..ed0e86f
--- /dev/null
+++ b/base/hostconfig/pine.sls
@@ -0,0 +1,8 @@
+pki:
+  cns:
+  - auth.lan 
+  - public.auth.lan
+  - secure.auth.lan
+  - nc.lan
+  - git-ui.lan
+  - hassio.lan