diff --git a/aws_bitbucket_mesh_node.yml b/aws_bitbucket_mesh_node.yml
index c094cec..a88c2cf 100644
--- a/aws_bitbucket_mesh_node.yml
+++ b/aws_bitbucket_mesh_node.yml
@@ -17,9 +17,12 @@
       - 'Environment=JMX_PASSWORD_FILE=/var/atlassian/application-data/jmx/jmx.access'
       - 'Environment="JVM_SUPPORT_RECOMMENDED_ARGS=-Dmesh.enabled=true -Dplugin.bitbucket-git.mesh.sidecar.child-process=false -Dcom.sun.management.jmxremote.port=4444 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath={{ atl_home_base }}/{{ atl_product_edition }}/log"'
       - 'Environment=JVM_MAXIMUM_MEMORY={{ atl_jvm_heap }}'
+      - 'PassEnvironment=JMX_REMOTE_AUTH JMX_PASSWORD_FILE JAVA_HOME'
+
     atl_startup_exec_path: "{{ mesh_install_dir }}/current/bin/start-mesh.sh"
     atl_stop_exec_path: "{{ mesh_install_dir }}/current/bin/stop-mesh.sh"
     atl_systemd_service_target: "multi-user.target"
+    atl_startup_exec_options: []
 
   roles:
     - role: linux_common
diff --git a/roles/bitbucket_mesh/tasks/main.yml b/roles/bitbucket_mesh/tasks/main.yml
index ed72725..fa3d29b 100644
--- a/roles/bitbucket_mesh/tasks/main.yml
+++ b/roles/bitbucket_mesh/tasks/main.yml
@@ -7,8 +7,10 @@
     group: "{{ atl_product_user_uid }}"
     mode: 0750
     state: directory
+    recurse: yes
   with_items:
     - "{{ atl_home_base }}/{{ atl_product_edition }}"
+    - "{{ atl_home_base }}/{{ atl_product_user }}"
     - "{{ mesh_install_dir }}"
 
 - name: download the mesh distribution using maven
@@ -54,3 +56,11 @@
     state: link
   when:
     - mesh_extract.changed | bool
+
+- name: touch the jmx password file
+  ansible.builtin.file:
+    src: '/var/atlassian/application-data/jmx/jmx.access'
+    state: touch
+    owner: "{{ atl_product_user_uid }}"
+    group: "{{ atl_product_user_uid }}"
+    mode: 0600
\ No newline at end of file