diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 4ddb62d3b57..e3b4ea38646 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1112,6 +1112,38 @@ config BT_MESH_SAR_CFG_CLI
 	help
 	  Enable support for the SAR configuration client model.
 
+config BT_MESH_OP_AGG
+	bool
+
+config BT_MESH_OP_AGG_SRV
+	bool "Support for Opcode Aggregator Server Model"
+	select BT_MESH_OP_AGG
+	help
+	  Enable support for the Opcode Aggregator Server model.
+
+config BT_MESH_OP_AGG_CLI
+	bool "Support for Opcode Aggregator Client Model"
+	select BT_MESH_OP_AGG
+	help
+	  Enable support for the Opcode Aggregator Client model.
+
+if BT_MESH_OP_AGG_CLI
+
+config BT_MESH_OP_AGG_CLI_TIMEOUT
+	int "Opcodes Aggregator Client model timeout in milliseconds"
+	default 10000
+	help
+	  This timeout controls how long Opcodes Aggregator Client waits
+	  for a response message to arrive. This value can be changed at
+	  runtime using @ref bt_mesh_op_agg_cli_timeout_set.
+
+endif # BT_MESH_OP_AGG_CLI
+
+config BT_MESH_LARGE_COMP_DATA_SRV
+	bool "Support for Large Composition Data Server Model"
+	help
+	  Enable support for the Large Composition Data Server model.
+
 endmenu # Models
 
 menu "Proxy"
@@ -1494,38 +1526,6 @@ config BT_MESH_FRIEND_ADV_LATENCY
 
 endif # BT_MESH_FRIEND
 
-config BT_MESH_OP_AGG
-	bool
-
-config BT_MESH_OP_AGG_SRV
-	bool "Support for Opcode Aggregator Server Model"
-	select BT_MESH_OP_AGG
-	help
-	  Enable support for the Opcode Aggregator Server model.
-
-config BT_MESH_OP_AGG_CLI
-	bool "Support for Opcode Aggregator Client Model"
-	select BT_MESH_OP_AGG
-	help
-	  Enable support for the Opcode Aggregator Client model.
-
-if BT_MESH_OP_AGG_CLI
-
-config BT_MESH_OP_AGG_CLI_TIMEOUT
-	int "Opcodes Aggregator Client model timeout in milliseconds"
-	default 10000
-	help
-	  This timeout controls how long Opcodes Aggregator Client waits
-	  for a response message to arrive. This value can be changed at
-	  runtime using @ref bt_mesh_op_agg_cli_timeout_set.
-
-endif # BT_MESH_OP_AGG_CLI
-
-config BT_MESH_LARGE_COMP_DATA_SRV
-	bool "Support for Large Composition Data Server Model"
-	help
-	  Enable support for the Large Composition Data Server model.
-
 if BT_MESH_LARGE_COMP_DATA_SRV
 
 config BT_MESH_MODELS_METADATA_PAGE_LEN