diff --git a/aws_bitbucket_mesh_node.yml b/aws_bitbucket_mesh_node.yml
index 975a04d..80ad066 100644
--- a/aws_bitbucket_mesh_node.yml
+++ b/aws_bitbucket_mesh_node.yml
@@ -7,6 +7,7 @@
     atl_product_family: "stash"
     atl_product_edition: "mesh"
     atl_product_user: "bitbucket"
+    atl_product_home: "{{ atl_home_base }}/{{ atl_product_edition }}"
     atl_systemd_service_name: "mesh.service"
     atl_startup_systemd_params:
       - 'UMask=0027'
diff --git a/roles/product_startup/templates/product.service.j2 b/roles/product_startup/templates/product.service.j2
index 9c16e66..fa6d398 100644
--- a/roles/product_startup/templates/product.service.j2
+++ b/roles/product_startup/templates/product.service.j2
@@ -17,7 +17,7 @@ StandardError=journal+console
 
 {# Bitbucket DC sets up its service start/stop logging in a different way to all our other DC offerings and so we exclude it from having the catalina.out redirect and foreground startup #}
 {% if (atl_product_family == "stash") %}
-PIDFile={{ atl_product_home }}/log/bitbucket.pid
+PIDFile={{ atl_product_home }}/log/{{ atl_product_edition }}.pid
 ExecStart={{ atl_startup_exec_path }}{% for c in atl_startup_exec_options %} {{ c }}{% endfor %}
 
 ExecStop={{ atl_stop_exec_path }}