diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index 52de505..0e5d297 100644
--- a/aws_bitbucket_dc_node.yml
+++ b/aws_bitbucket_dc_node.yml
@@ -32,7 +32,10 @@
   roles:
     - role: linux_common
     - role: aws_common
-    - role: nfs_mount
+    # For Bitbucket DC clusters that store repos on Bitbucket Mesh(https://confluence.atlassian.com/bitbucketserver/bitbucket-data-center-and-server-8-0-release-notes-1115659343.html#BitbucketDataCenterandServer8.0releasenotes-mesh),
+    # nodes may be setup to use EFS instead of NFS for shared_home by not defining 'atl_fileserver_host'
+    - { role: aws_shared_fs_config, when: (atl_fileserver_host is not defined) and (atl_efs_id|length > 0) }
+    - { role: nfs_mount, when : (atl_fileserver_host is defined) and (atl_fileserver_host|length > 0) }
     - role: product_common
     - role: product_install
     - role: database_init
diff --git a/pipeline_generator/pipeline.py b/pipeline_generator/pipeline.py
index c356a56..4a5c5c2 100644
--- a/pipeline_generator/pipeline.py
+++ b/pipeline_generator/pipeline.py
@@ -16,6 +16,7 @@ def find_all_scenarios():
 def load_template():
     jenv = j2.Environment(
         loader=j2.FileSystemLoader('.'),
+        autoescape=True,
         lstrip_blocks=True,
         trim_blocks=True)
     return jenv.get_template(PIPELINE_TEMPLATE_J2_FILE)