diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index d034cab5c..974dd5bd1 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -1,83 +1,33 @@
-# Create a state directory
+# Add ES Group
+kibanasearchgroup:
+  group.present:
+    - name: elasticsearch
+    - gid: 932
 
-statedir:
-  file.directory:
-    - name: /opt/so/state
-
-salttmp:
-  file.directory:
-    - name: /opt/so/tmp
-
-# Install packages needed for the sensor
-
-sensorpkgs:
-  pkg.installed:
-    - skip_suggestions: True
-    - pkgs:
-      - docker-ce
-      - python-docker
-
-# Always keep these packages up to date
-
-alwaysupdated:
-  pkg.latest:
-    - pkgs:
-      - openssl
-      - openssh-server
-      - bash
-    - skip_suggestions: True
-
-# Set time to UTC
-
-Etc/UTC:
-  timezone.system
-
-# Set up docker network
-dockernet:
-  docker_network.present:
-    - name: so-elastic-net
-    - driver: bridge
-
-# Snag the so-core docker
-toosmooth/so-core:test2:
-  docker_image.present
+# Add ES user
+kibanasearch:
+  user.present:
+    - uid: 932
+    - gid: 932
+    - home: /opt/so/conf/kibana
+    - createhome: False
 
 # Drop the correct nginx config based on role
 
-nginxconfdir:
+kibanaconfdir:
   file.directory:
-    - name: /opt/so/conf/nginx
-    - user: 939
+    - name: /opt/so/conf/kibana
+    - user: 932
     - group: 939
     - makedirs: True
 
-nginxconf:
-  file.managed:
-    - name: /opt/so/conf/nginx/nginx.conf
-    - user: 939
-    - group: 939
-    - template: jinja
-    - source: salt://common/nginx/nginx.conf.{{ grains.role }}
 
-nginxlogdir:
-  file.directory:
-    - name: /opt/so/log/nginx/
-    - user: 939
-    - group: 939
-
-nginxtmp:
-  file.directory:
-    - name: /opt/so/tmp/nginx/tmp
-    - user: 939
-    - group: 939
-    - makedirs: True
-
-# Start the core docker
-so-core:
+# Start the kibana docker
+so-kibana:
   docker_container.running:
-    - image: toosmooth/so-core:test2
-    - hostname: so-core
-    - user: socore
+    - image: toosmooth/so-kibana:test2
+    - hostname: kibana
+    - user: kibana
     - binds:
       - /opt/so:/opt/so:rw
       - /opt/so/conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
@@ -85,7 +35,5 @@ so-core:
       - /opt/so/tmp/nginx/:/var/lib/nginx:rw
       - /opt/so/tmp/nginx/:/run:rw
     - network_mode: so-elastic-net
-    - cap_add: NET_BIND_SERVICE
     - port_bindings:
-      - 80:80
-      - 443:443
+      - 127.0.01:5601:5601