diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index 3d8348e..96c19d8 100644
--- a/aws_bitbucket_dc_node.yml
+++ b/aws_bitbucket_dc_node.yml
@@ -22,7 +22,6 @@
       - "Environment=JVM_MINIMUM_MEMORY={{ atl_jvm_heap }}"
       - "Environment=JVM_SUPPORT_RECOMMENDED_ARGS={{ atl_jvm_opts }}"
     atl_startup_exec_options:
-      - "-fg"
       - "--no-search"
 
   roles:
@@ -37,5 +36,5 @@
     - role: product_startup
     - role: bitbucket_dataset_restore
       when: atl_bitbucket_dataset_url is search ("(http|https)://")
-  
+
 
diff --git a/roles/product_startup/templates/product.service.j2 b/roles/product_startup/templates/product.service.j2
index e432931..ac52bc3 100644
--- a/roles/product_startup/templates/product.service.j2
+++ b/roles/product_startup/templates/product.service.j2
@@ -18,7 +18,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
-ExecStart={{ atl_startup_exec_path }} --no-search
+ExecStart={{ atl_startup_exec_path }}{% for c in atl_startup_exec_options %} {{ c }}{% endfor %}
 ExecStop={{ atl_startup_exec_path }}
 {% else -%}
 ExecStart={{ atl_startup_exec_path }}{% for c in atl_startup_exec_options %} {{ c }}{% endfor %} >{{ atl_product_installation_current }}/logs/catalina.out 2>&1