diff --git a/salt/common/init.sls b/salt/common/init.sls
index fade9ddd9..0e4857345 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -166,6 +166,13 @@ so-telegraf:
 
 # If its a master or eval lets install the back end for now
 {% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' %}
+
+  # Influx DB
+  influxconfdir:
+    file.directory:
+      - name: /opt/so/conf/influxdb/etc
+      - makedirs: True
+
   influxdbdir:
     file.directory:
       - name: /nsm/influxdb
@@ -176,8 +183,20 @@ so-telegraf:
       - image: soshybridhunter/so-influxdb:HH1.0.4
       - hostname: influxdb
       - binds:
+        - /opt/so/conf/influxdb/etc:/etc/influxdb/influxdb.conf:ro
         - /nsm/influxdb:/var/lib/influxdb:rw
-      - environment:
-        - bootstrap.memory_lock=true
       - port_bindings:
         - 0.0.0.0:8086:8086
+
+  # Grafana all the things
+    so-grafana:
+      docker_container.running:
+        - image: soshybridhunter/so-grafana:HH1.0.4
+        - hostname: grafana
+        - binds:
+          - /nsm/grafana:/var/lib/grafana:rw
+        - environment:
+          - GF_SECURITY_ADMIN_PASSWORD=augusta
+        - port_bindings:
+          - 0.0.0.0:3000:3000
+{% endif %}