diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index e1edfc0..b0967d6 100644
--- a/aws_bitbucket_dc_node.yml
+++ b/aws_bitbucket_dc_node.yml
@@ -29,9 +29,6 @@
     atl_startup_exec_options:
       - "--no-search"
 
-    # Bitbucket DC Mirror nodes can set this to true to use the internal H2 database.
-    skip_database_init: false
-
   roles:
     - role: linux_common
     - role: aws_common
@@ -41,7 +38,9 @@
     - { role: nfs_mount, when: (atl_fileserver_host is defined) and (atl_fileserver_host|length > 0) }
     - role: product_common
     - role: product_install
-    - { role: database_init, when: not (skip_database_init | bool) }
+    - role: database_init
+      tags:
+        - database
     - role: bitbucket_config
     - role: product_startup
     - role: bitbucket_dataset_restore