diff --git a/cli/src/cli.rs b/cli/src/cli.rs
index 0287a333123a..d3ec195a97ff 100644
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -59,10 +59,7 @@ pub struct RunCmd {
 	#[structopt(long = "force-westend")]
 	pub force_westend: bool,
 
-	/// Disable the authority discovery module on validator or sentry nodes.
-	///
-	/// Enabled by default on validator and sentry nodes. Always disabled on
-	/// non validator or sentry nodes.
+	/// Enable the authority discovery module on validator or sentry nodes.
 	///
 	/// When enabled:
 	///
@@ -73,8 +70,8 @@ pub struct RunCmd {
 	/// (2) As a validator or sentry node: Discover addresses of validators or
 	///     addresses of their sentry nodes and maintain a permanent connection
 	///     to a subset.
-	#[structopt(long = "disable-authority-discovery")]
-	pub authority_discovery_disabled: bool,
+	#[structopt(long = "enable-authority-discovery")]
+	pub authority_discovery_enabled: bool,
 
 	/// Setup a GRANDPA scheduled voting pause.
 	///
diff --git a/cli/src/command.rs b/cli/src/command.rs
index 2d256374cdc7..86e8796408f7 100644
--- a/cli/src/command.rs
+++ b/cli/src/command.rs
@@ -114,7 +114,7 @@ pub fn run() -> Result<()> {
 
 			set_default_ss58_version(chain_spec);
 
-			let authority_discovery_disabled = cli.run.authority_discovery_disabled;
+			let authority_discovery_enabled = cli.run.authority_discovery_enabled;
 			let grandpa_pause = if cli.run.grandpa_pause.is_empty() {
 				None
 			} else {
@@ -138,7 +138,7 @@ pub fn run() -> Result<()> {
 						config,
 						None,
 						None,
-						authority_discovery_disabled,
+						authority_discovery_enabled,
 						6000,
 						grandpa_pause,
 					).map(|r| r.0),
diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs
index c347c94ec041..836e3f06f05c 100644
--- a/node/service/src/lib.rs
+++ b/node/service/src/lib.rs
@@ -301,7 +301,7 @@ fn new_full<RuntimeApi, Executor>(
 	mut config: Configuration,
 	collating_for: Option<(CollatorId, ParaId)>,
 	_max_block_data_size: Option<u64>,
-	_authority_discovery_disabled: bool,
+	_authority_discovery_enabled: bool,
 	_slot_duration: u64,
 	grandpa_pause: Option<(u32, u32)>,
 ) -> Result<(
@@ -644,7 +644,7 @@ pub fn polkadot_new_full(
 	config: Configuration,
 	collating_for: Option<(CollatorId, ParaId)>,
 	max_block_data_size: Option<u64>,
-	authority_discovery_disabled: bool,
+	authority_discovery_enabled: bool,
 	slot_duration: u64,
 	grandpa_pause: Option<(u32, u32)>,
 )
@@ -662,7 +662,7 @@ pub fn polkadot_new_full(
 		config,
 		collating_for,
 		max_block_data_size,
-		authority_discovery_disabled,
+		authority_discovery_enabled,
 		slot_duration,
 		grandpa_pause,
 	)?;
@@ -676,7 +676,7 @@ pub fn kusama_new_full(
 	config: Configuration,
 	collating_for: Option<(CollatorId, ParaId)>,
 	max_block_data_size: Option<u64>,
-	authority_discovery_disabled: bool,
+	authority_discovery_enabled: bool,
 	slot_duration: u64,
 	grandpa_pause: Option<(u32, u32)>,
 ) -> Result<(
@@ -694,7 +694,7 @@ pub fn kusama_new_full(
 		config,
 		collating_for,
 		max_block_data_size,
-		authority_discovery_disabled,
+		authority_discovery_enabled,
 		slot_duration,
 		grandpa_pause,
 	)?;
@@ -708,7 +708,7 @@ pub fn westend_new_full(
 	config: Configuration,
 	collating_for: Option<(CollatorId, ParaId)>,
 	max_block_data_size: Option<u64>,
-	authority_discovery_disabled: bool,
+	authority_discovery_enabled: bool,
 	slot_duration: u64,
 	grandpa_pause: Option<(u32, u32)>,
 )
@@ -726,7 +726,7 @@ pub fn westend_new_full(
 		config,
 		collating_for,
 		max_block_data_size,
-		authority_discovery_disabled,
+		authority_discovery_enabled,
 		slot_duration,
 		grandpa_pause,
 	)?;
diff --git a/node/test-service/src/lib.rs b/node/test-service/src/lib.rs
index bc210c2384f4..03b8dd6aa62f 100644
--- a/node/test-service/src/lib.rs
+++ b/node/test-service/src/lib.rs
@@ -62,7 +62,7 @@ pub fn polkadot_test_new_full(
 	config: Configuration,
 	collating_for: Option<(CollatorId, ParaId)>,
 	max_block_data_size: Option<u64>,
-	authority_discovery_disabled: bool,
+	authority_discovery_enabled: bool,
 	slot_duration: u64,
 ) -> Result<
 	(
@@ -79,7 +79,7 @@ pub fn polkadot_test_new_full(
 			config,
 			collating_for,
 			max_block_data_size,
-			authority_discovery_disabled,
+			authority_discovery_enabled,
 			slot_duration,
 			None,
 			true,
@@ -198,9 +198,9 @@ pub fn run_test_node(
 > {
 	let config = node_config(storage_update_func, task_executor, key, boot_nodes);
 	let multiaddr = config.network.listen_addresses[0].clone();
-	let authority_discovery_disabled = true;
+	let authority_discovery_enabled = false;
 	let (task_manager, client, handles, network, rpc_handlers) =
-		polkadot_test_new_full(config, None, None, authority_discovery_disabled, 6000)
+		polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000)
 			.expect("could not create Polkadot test service");
 
 	let peer_id = network.local_peer_id().clone();
diff --git a/service/src/lib.rs b/service/src/lib.rs
index 1897e026ddab..5a45147caf2a 100644
--- a/service/src/lib.rs
+++ b/service/src/lib.rs
@@ -250,7 +250,7 @@ pub fn new_full<RuntimeApi, Executor>(
 	mut config: Configuration,
 	collating_for: Option<(CollatorId, parachain::Id)>,
 	max_block_data_size: Option<u64>,
-	authority_discovery_disabled: bool,
+	authority_discovery_enabled: bool,
 	slot_duration: u64,
 	grandpa_pause: Option<(u32, u32)>,
 	test: bool,
@@ -453,7 +453,7 @@ pub fn new_full<RuntimeApi, Executor>(
 	}
 
 	if matches!(role, Role::Authority{..} | Role::Sentry{..}) {
-		if !authority_discovery_disabled {
+		if authority_discovery_enabled {
 			let (sentries, authority_discovery_role) = match role {
 				Role::Authority { ref sentry_nodes } => (
 					sentry_nodes.clone(),
@@ -690,7 +690,7 @@ pub fn polkadot_new_full(
 	config: Configuration,
 	collating_for: Option<(CollatorId, parachain::Id)>,
 	max_block_data_size: Option<u64>,
-	authority_discovery_disabled: bool,
+	authority_discovery_enabled: bool,
 	slot_duration: u64,
 	grandpa_pause: Option<(u32, u32)>,
 )
@@ -704,7 +704,7 @@ pub fn polkadot_new_full(
 		config,
 		collating_for,
 		max_block_data_size,
-		authority_discovery_disabled,
+		authority_discovery_enabled,
 		slot_duration,
 		grandpa_pause,
 		false,
@@ -719,7 +719,7 @@ pub fn kusama_new_full(
 	config: Configuration,
 	collating_for: Option<(CollatorId, parachain::Id)>,
 	max_block_data_size: Option<u64>,
-	authority_discovery_disabled: bool,
+	authority_discovery_enabled: bool,
 	slot_duration: u64,
 	grandpa_pause: Option<(u32, u32)>,
 ) -> Result<(
@@ -732,7 +732,7 @@ pub fn kusama_new_full(
 		config,
 		collating_for,
 		max_block_data_size,
-		authority_discovery_disabled,
+		authority_discovery_enabled,
 		slot_duration,
 		grandpa_pause,
 		false,
@@ -747,7 +747,7 @@ pub fn westend_new_full(
 	config: Configuration,
 	collating_for: Option<(CollatorId, parachain::Id)>,
 	max_block_data_size: Option<u64>,
-	authority_discovery_disabled: bool,
+	authority_discovery_enabled: bool,
 	slot_duration: u64,
 	grandpa_pause: Option<(u32, u32)>,
 )
@@ -761,7 +761,7 @@ pub fn westend_new_full(
 		config,
 		collating_for,
 		max_block_data_size,
-		authority_discovery_disabled,
+		authority_discovery_enabled,
 		slot_duration,
 		grandpa_pause,
 		false,
@@ -776,7 +776,7 @@ pub fn rococo_new_full(
 	config: Configuration,
 	collating_for: Option<(CollatorId, parachain::Id)>,
 	max_block_data_size: Option<u64>,
-	authority_discovery_disabled: bool,
+	authority_discovery_enabled: bool,
 	slot_duration: u64,
 	grandpa_pause: Option<(u32, u32)>,
 )
@@ -790,7 +790,7 @@ pub fn rococo_new_full(
 		config,
 		collating_for,
 		max_block_data_size,
-		authority_discovery_disabled,
+		authority_discovery_enabled,
 		slot_duration,
 		grandpa_pause,
 		false,
@@ -829,7 +829,7 @@ pub fn build_full(
 	config: Configuration,
 	collating_for: Option<(CollatorId, parachain::Id)>,
 	max_block_data_size: Option<u64>,
-	authority_discovery_disabled: bool,
+	authority_discovery_enabled: bool,
 	slot_duration: u64,
 	grandpa_pause: Option<(u32, u32)>,
 ) -> Result<(TaskManager, Client, FullNodeHandles), ServiceError> {
@@ -838,7 +838,7 @@ pub fn build_full(
 			config,
 			collating_for,
 			max_block_data_size,
-			authority_discovery_disabled,
+			authority_discovery_enabled,
 			slot_duration,
 			grandpa_pause,
 			false,
@@ -848,7 +848,7 @@ pub fn build_full(
 			config,
 			collating_for,
 			max_block_data_size,
-			authority_discovery_disabled,
+			authority_discovery_enabled,
 			slot_duration,
 			grandpa_pause,
 			false,
@@ -858,7 +858,7 @@ pub fn build_full(
 			config,
 			collating_for,
 			max_block_data_size,
-			authority_discovery_disabled,
+			authority_discovery_enabled,
 			slot_duration,
 			grandpa_pause,
 			false,
@@ -868,7 +868,7 @@ pub fn build_full(
 			config,
 			collating_for,
 			max_block_data_size,
-			authority_discovery_disabled,
+			authority_discovery_enabled,
 			slot_duration,
 			grandpa_pause,
 			false,