diff --git a/elasticsearch-env b/elasticsearch-env
index 3c396b9..7e6b1d4 100644
--- a/elasticsearch-env
+++ b/elasticsearch-env
@@ -38,8 +38,14 @@ if [ ! -z "$JAVA_OPTS" ]; then
   echo "pass JVM parameters via ES_JAVA_OPTS"
 fi
 
+if [[ "$("$JAVA" -version 2>/dev/null)" =~ "Unable to map CDS archive" ]]; then
+  XSHARE="-Xshare:off"
+else
+  XSHARE="-Xshare:auto"
+fi
+
 # check the Java version
-"$JAVA" -cp "$ES_CLASSPATH" org.elasticsearch.tools.java_version_checker.JavaVersionChecker
+"$JAVA" "$XSHARE" -cp "$ES_CLASSPATH" org.elasticsearch.tools.java_version_checker.JavaVersionChecker
 
 export HOSTNAME=$HOSTNAME
 
diff --git a/elasticsearch-tmpfile.conf b/elasticsearch-tmpfile.conf
index 86c4cf6..06070b4 100644
--- a/elasticsearch-tmpfile.conf
+++ b/elasticsearch-tmpfile.conf
@@ -4,3 +4,4 @@ d /usr/share/elasticsearch/plugins 0755 elasticsearch elasticsearch -
 
 d /etc/elasticsearch 2750 - elasticsearch -
 d /etc/elasticsearch/scripts 0750 - elasticsearch -
+d /etc/elasticsearch/jvm.options.d 0750 - elasticsearch -