diff --git a/manifests/instance.pp b/manifests/instance.pp
index 813136f81..f2bdc1596 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -162,6 +162,7 @@
   Boolean                            $ssl                           = false,
   Elasticsearch::Status              $status                        = $elasticsearch::status,
   Optional[String]                   $system_key                    = $elasticsearch::system_key,
+  Integer                            $repo_version                  = $elastic_stack::repo::version,
 ) {
 
   File {
@@ -461,6 +462,7 @@
       $elasticsearch::init_defaults,
       {
         'CONF_DIR'       => $configdir,
+        'ES_PATH_DIR'    => $configdir,
         'ES_HOME'        => $elasticsearch::homedir,
         'ES_JVM_OPTIONS' => "${configdir}/jvm.options",
         'ES_PATH_CONF'   => $configdir,
diff --git a/templates/etc/elasticsearch/jvm.options.erb b/templates/etc/elasticsearch/jvm.options.erb
index c9b0dded9..f83903e4a 100644
--- a/templates/etc/elasticsearch/jvm.options.erb
+++ b/templates/etc/elasticsearch/jvm.options.erb
@@ -25,14 +25,27 @@ defaults = {
   '-Dlog4j.shutdownHookEnabled' => '-Dlog4j.shutdownHookEnabled=false',
   '-Dlog4j2.disable.jmx' => '-Dlog4j2.disable.jmx=true',
   'HeapDumpOnOutOfMemoryError' => '-XX:+HeapDumpOnOutOfMemoryError',
-  'PrintGCDetails' => '-XX:+PrintGCDetails',
-  'PrintGCDateStamps' => '-XX:+PrintGCDateStamps',
-  'PrintTenuringDistribution' => '-XX:+PrintTenuringDistribution',
-  'Xloggc' => "-Xloggc:#{@logdir}/gc.log",
-  'UseGCLogFileRotation' => '-XX:+UseGCLogFileRotation',
-  'NumberOfGCLogFiles' => '-XX:NumberOfGCLogFiles=32',
-  'GCLogFileSize' => '-XX:GCLogFileSize=64m',
+  'PrintGCDetails' => '8:-XX:+PrintGCDetails',
+  'PrintGCDateStamps' => '8:-XX:+PrintGCDateStamps',
+  'PrintTenuringDistribution' => '8:-XX:+PrintTenuringDistribution',
+  'Xloggc' => "8:-Xloggc:#{@logdir}/gc.log",
+  'UseGCLogFileRotation' => '8:-XX:+UseGCLogFileRotation',
+  'NumberOfGCLogFiles' => '8:-XX:NumberOfGCLogFiles=32',
+  'GCLogFileSize' => '8:-XX:GCLogFileSize=64m',
 }
+defaults_7x = {
+  '-Des.networkaddress.cache.ttl'          => '-Des.networkaddress.cache.ttl=60',
+  '-Des.networkaddress.cache.negative.ttl' => '-Des.networkaddress.cache.negative.ttl=10',
+  '-Djava.io.tmpdir'                       => '-Djava.io.tmpdir=${ES_TMPDIR}',
+  'HeapDumpPath'                           => '-XX:HeapDumpPath=/var/lib/elasticsearch',
+  'ErrorFile'                              => "-XX:ErrorFile=#{@logdir}/hs_err_pid%p.log",
+  'PrintGCApplicationStoppedTime'          => '8:-XX:+PrintGCApplicationStoppedTime',
+  'Xlog'                                   => "9-:-Xlog:gc*,gc+age=trace,safepoint:file=#{@logdir}/gc.log:utctime,pid,tags:filecount=32,filesize=64m",
+  '-Djava.locale.providers'                => '9-:-Djava.locale.providers=COMPAT',
+}
+
+if ( @repo_version >= 8 ) then defaults.merge!( defaults_7x ) end
+
 defaults.each {|k,v| set_default(@jvm_options, k, v)}
 
 -%>
diff --git a/templates/etc/elasticsearch/log4j2.properties.erb b/templates/etc/elasticsearch/log4j2.properties.erb
index 4e4d831f7..6de336710 100644
--- a/templates/etc/elasticsearch/log4j2.properties.erb
+++ b/templates/etc/elasticsearch/log4j2.properties.erb
@@ -1,3 +1,4 @@
+<%- @node_marker = @repo_version >= 7 ? '[%node_name]%marker' : '%marker' -%>
 status = <%= @logging_level.downcase %>
 
 # log action execution errors for easier debugging
@@ -7,20 +8,20 @@ logger.action.level = debug
 appender.console.type = Console
 appender.console.name = console
 appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n
+appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] <%= @node_marker %>%m%n
 
 <%- if @file_rolling_type == 'file' -%>
 appender.fixed.type = File
 appender.fixed.name = fixed
 appender.fixed.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}.log
 appender.fixed.layout.type = PatternLayout
-appender.fixed.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%.-10000m%n
+appender.fixed.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] <%= @node_marker %>%.-10000m%n
 <%- else -%>
 appender.rolling.type = RollingFile
 appender.rolling.name = rolling
 appender.rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}.log
 appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%.-10000m%n
+appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] <%= @node_marker %>%.-10000m%n
 <%- if @file_rolling_type == 'dailyRollingFile' -%>
 appender.rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}-%d{yyyy-MM-dd}-%i.log.gz
 appender.rolling.policies.type = Policies
@@ -49,7 +50,7 @@ appender.deprecation_rolling.type = RollingFile
 appender.deprecation_rolling.name = deprecation_rolling
 appender.deprecation_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation.log
 appender.deprecation_rolling.layout.type = PatternLayout
-appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%.-10000m%n
+appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] <%= @node_marker %>%.-10000m%n
 appender.deprecation_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation-%i.log.gz
 appender.deprecation_rolling.policies.type = Policies
 appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy
@@ -70,7 +71,7 @@ appender.index_search_slowlog_rolling.type = RollingFile
 appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling
 appender.index_search_slowlog_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_index_search_slowlog.log
 appender.index_search_slowlog_rolling.layout.type = PatternLayout
-appender.index_search_slowlog_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %marker%.-10000m%n
+appender.index_search_slowlog_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] <%= @node_marker %>%.-10000m%n
 appender.index_search_slowlog_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_index_search_slowlog-%d{yyyy-MM-dd}.log
 appender.index_search_slowlog_rolling.policies.type = Policies
 appender.index_search_slowlog_rolling.policies.time.type = TimeBasedTriggeringPolicy
@@ -86,7 +87,7 @@ appender.index_indexing_slowlog_rolling.type = RollingFile
 appender.index_indexing_slowlog_rolling.name = index_indexing_slowlog_rolling
 appender.index_indexing_slowlog_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_index_indexing_slowlog.log
 appender.index_indexing_slowlog_rolling.layout.type = PatternLayout
-appender.index_indexing_slowlog_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %marker%.-10000m%n
+appender.index_indexing_slowlog_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] <%= @node_marker %>%.-10000m%n
 appender.index_indexing_slowlog_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_index_indexing_slowlog-%d{yyyy-MM-dd}.log
 appender.index_indexing_slowlog_rolling.policies.type = Policies
 appender.index_indexing_slowlog_rolling.policies.time.type = TimeBasedTriggeringPolicy