diff --git a/salt/elastic/init.sls b/salt/elastic/init.sls
index 300924725..5a41b0e0e 100644
--- a/salt/elastic/init.sls
+++ b/salt/elastic/init.sls
@@ -5,37 +5,22 @@ so-elasticsearch:
     - hostname: elasticsearch
     - user:
     - environment:
-      - "bootstrap.memory_lock=true"
-      - "cluster.name={{ grains.host }}"
+      - bootstrap.memory_lock=true
+      - cluster.name={{ grains.host }}
       - ES_JAVA_OPTS="-Xms$ELASTICSEARCH_HEAP -Xmx$ELASTICSEARCH_HEAP"
-      - "http.host=0.0.0.0"
-      - "transport.host=127.0.0.1" 
+      - http.host=0.0.0.0
+      - transport.host=127.0.0.1
+    - ulimits:
+      - memlock=-1:-1
+      - nofile=65536:65536
+      - nproc=4096
     - port_bindings:
       - 9200
       - 9300
     - binds:
       - /opt/so/conf/logstash/log4j2.properties:/usr/share/logstash/config/log4j2.properties:ro
-      - /etc/elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
-      - /etc/elasticsearch/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties:ro
-      - /nsm/elasticsearch:/usr/share/elasticsearch/data
-      - /var/log/elasticsearch:/var/log/elasticsearch
+      - /opt/so/conf/elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
+      - /opt/so/conf/elasticsearch/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties:ro
+      - /nsm/elasticsearch:/usr/share/elasticsearch/data:rw
+      - /opt/so/log/elasticsearch:/var/log/elasticsearch:rw
     - network_mode: so-elastic-net
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                        --ulimit memlock=-1:-1 \
-                        --ulimit nofile=65536:65536 \
-                        --ulimit nproc=4096 \
-                        $ELASTICSEARCH_OPTIONS \