diff --git a/roles/bitbucket_config/templates/bitbucket.service.j2 b/roles/bitbucket_config/templates/bitbucket.service.j2
index fad0ed0..001430b 100644
--- a/roles/bitbucket_config/templates/bitbucket.service.j2
+++ b/roles/bitbucket_config/templates/bitbucket.service.j2
@@ -5,9 +5,11 @@ After=network-online.target
 [Service]
 User={{ atl_product_user }}
 Group={{ atl_product_user }}
-
+UMask=0027
+LimitNOFILE=4096
 Environment=BITBUCKET_HOME={{ atl_product_home_shared }}
-ExecStart={{ atl_product_installation_current }}/bin/start-bitbucket.sh -fg
+
+ExecStart={{ atl_product_installation_current }}/bin/start-bitbucket.sh -fg --no-search
 Restart=on-failure
 
 [Install]