diff --git a/defaults/main.yml b/defaults/main.yml
index 70ad585..62dec45 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -36,5 +36,5 @@ pid_dir: ''
 log_dir: ''
 conf_dir: ''
 data_dirs: ''
-# JMX remote monitoring
-jmx_remote_monitoring_enabled: true
+# JVM custom parameters
+es_jvm_custom_parameters: ''
diff --git a/templates/jvm.options.j2 b/templates/jvm.options.j2
index 97f26b0..0e70a75 100644
--- a/templates/jvm.options.j2
+++ b/templates/jvm.options.j2
@@ -106,6 +106,8 @@
 # WARNING: This option will be removed in Elasticsearch 6.0.0 and is provided
 # only for migration purposes.
 #-Delasticsearch.json.allow_unquoted_field_names=true
-{% if jmx_remote_monitoring_enabled == true %}
--Dcom.sun.management.jmxremote
+{% if es_jvm_custom_parameters !='' %}
+{% for item in es_jvm_custom_parameters %}
+{{ item }}
+{% endfor %}
 {% endif %}