diff --git a/dicos/25_bdd_server.xml b/dicos/25_bdd_server.xml
index 270f704..a23402f 100644
--- a/dicos/25_bdd_server.xml
+++ b/dicos/25_bdd_server.xml
@@ -162,8 +162,9 @@
 
 		<condition name='disabled_if_in' source="dbEnable">
 			<param>non</param>
-			<target type='family'>Database Cluster</target>
 			<target type='family'>Database</target>
+			<target type='family'>Database Cluster</target>
+			<target type='family'>DataBase Tunning</target>
 			<target type='service_accesslist'>dbCluster</target>
 			<target type='filelist'>dbTunning</target>
 			<target type='filelist'>dbMariaDB</target>
diff --git a/preservice/25-bdd-init b/preservice/25-bdd-init
index cc88378..964502b 100644
--- a/preservice/25-bdd-init
+++ b/preservice/25-bdd-init
@@ -4,6 +4,8 @@
 # and secure MariaDB installation
 #
 
+[[ "$(CreoleGet dbEnable)" == "non" ]] && exit 0
+
 ROLE=$(CreoleGet dbClusterPosition 'Leader')
 SECURE_CMD="mysql_secure_installation"
 PASSWORD=$(pwgen -1 10)