diff --git a/salt/elasticsearch/files/log4j2.properties b/salt/elasticsearch/files/log4j2.properties
index 75c09ee39..85cf5d8fb 100644
--- a/salt/elasticsearch/files/log4j2.properties
+++ b/salt/elasticsearch/files/log4j2.properties
@@ -18,6 +18,3 @@ appender.rolling.policies.time.interval = 1
 appender.rolling.policies.time.modulate = true
 rootLogger.level = info
 rootLogger.appenderRef.rolling.ref = rolling
-log4j2.formatMsgNoLookups = true
-
-
diff --git a/salt/logstash/etc/jvm.options b/salt/logstash/etc/jvm.options
new file mode 100644
index 000000000..5af9281fc
--- /dev/null
+++ b/salt/logstash/etc/jvm.options
@@ -0,0 +1 @@
+-Dlog4j2.formatMsgNoLookups=true
diff --git a/salt/logstash/etc/log4j2.properties b/salt/logstash/etc/log4j2.properties
index 66bb65cbc..73a646b8d 100644
--- a/salt/logstash/etc/log4j2.properties
+++ b/salt/logstash/etc/log4j2.properties
@@ -34,4 +34,3 @@ rootLogger.level = info
 rootLogger.appenderRef.rolling.ref = rolling
 #rootLogger.level = ${sys:ls.log.level}
 #rootLogger.appenderRef.console.ref = ${sys:ls.log.format}_console
-log4j2.formatMsgNoLookups = true
diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index 37a298237..069b2f7bd 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -156,7 +156,7 @@ so-logstash:
     - extra_hosts:
       - {{ EXTRAHOSTHOSTNAME }}:{{ EXTRAHOSTIP }}
     - environment:
-      - LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }} -Dlog4j2.formatMsgNoLookups=true
+      - LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }}
     - port_bindings:
   {% for BINDING in DOCKER_OPTIONS.port_bindings %}
       - {{ BINDING }}
diff --git a/salt/thehive/etc/es/log4j2.properties b/salt/thehive/etc/es/log4j2.properties
index 3000eefec..85cf5d8fb 100644
--- a/salt/thehive/etc/es/log4j2.properties
+++ b/salt/thehive/etc/es/log4j2.properties
@@ -18,5 +18,3 @@ appender.rolling.policies.time.interval = 1
 appender.rolling.policies.time.modulate = true
 rootLogger.level = info
 rootLogger.appenderRef.rolling.ref = rolling
-log4j2.formatMsgNoLookups = true
-