diff --git a/roles/jira_config/molecule/default/playbook.yml b/roles/jira_config/molecule/default/playbook.yml
index 52b2e51..36a90d9 100644
--- a/roles/jira_config/molecule/default/playbook.yml
+++ b/roles/jira_config/molecule/default/playbook.yml
@@ -11,6 +11,7 @@
     atl_jdbc_user: 'atljira'
     atl_jdbc_password: 'molecule_password'
     atl_jvm_heap: 'PLACEHOLDER'
+    atl_jvm_opts: 'PLACEHOLDER'
     atl_cluster_node_id: 'FAKEID'
     atl_db_poolminsize: 1111
     atl_db_poolmaxsize: 1111
diff --git a/roles/jira_config/molecule/default/tests/test_default.py b/roles/jira_config/molecule/default/tests/test_default.py
index 4ab33d9..df921e3 100644
--- a/roles/jira_config/molecule/default/tests/test_default.py
+++ b/roles/jira_config/molecule/default/tests/test_default.py
@@ -38,6 +38,7 @@ def test_setenv_file(host):
     assert f.contains('^JVM_MAXIMUM_MEMORY="PLACEHOLDER"')
     assert f.contains('^JIRA_HOME="/var/atlassian/application-data/jira"')
     assert f.contains('^export CATALINA_OPTS="')
+    assert f.contains('^JVM_SUPPORT_RECOMMENDED_ARGS="PLACEHOLDER"')
 
 
 def test_cluster_file(host):
diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index 8367501..cfa0bb6 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -41,6 +41,12 @@
     insertafter: "EOF"
     line: 'export CATALINA_OPTS="${CATALINA_OPTS} {{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"'
 
+- name: Set support recommended JVM args
+  lineinfile:
+    path: "{{ atl_product_installation_versioned }}/bin/setenv.sh"
+    regexp: "JVM_SUPPORT_RECOMMENDED_ARGS="
+    line: 'JVM_SUPPORT_RECOMMENDED_ARGS="{{ atl_jvm_opts }}"'
+
 - name: Create application directories
   file:
     path: "{{ item }}"