diff --git a/src/drunc/integtest/controller_test.py b/src/drunc/integtest/controller_test.py
index 9b951c2f2..d3838a94e 100644
--- a/src/drunc/integtest/controller_test.py
+++ b/src/drunc/integtest/controller_test.py
@@ -46,8 +46,8 @@
 conf_dict.session = "minimal"
 conf_dict.tpg_enabled = False
 
-# For testing, allow drunc to manage ConnectivityService (default is False, integrationtest manages Connectivity Service)
-conf_dict.drunc_connsvc = True
+# Request that drunc manages the ConnectivityService
+conf_dict.connsvc_control = data_classes.ConnSvcControl.RUNCONTROL
 # For testing, specify connectivity service port (default is 0, a random port is chosen for the Connectivity Service)
 # conf_dict.connsvc_port = 12345
 
diff --git a/src/drunc/integtest/failure_mode_death_on_boot_nest_app_test.py b/src/drunc/integtest/failure_mode_death_on_boot_nest_app_test.py
index e43d43c58..cac806f4f 100644
--- a/src/drunc/integtest/failure_mode_death_on_boot_nest_app_test.py
+++ b/src/drunc/integtest/failure_mode_death_on_boot_nest_app_test.py
@@ -43,9 +43,8 @@
 conf_dict.op_env = "test"
 
 # Connectivity service configuration
-# Allow drunc to manage ConnectivityService (default is False, integrationtest manages
-# the Connectivity Service)
-conf_dict.drunc_connsvc = True
+# drunc manages the ConnectivityService with a pre-defined dunedaq configuration
+# conf_dict.connsvc_control = data_classes.ConnSvcControl.RUNCONTROL
 # Specify connectivity service port (default is 0, a random port is chosen for the
 # Connectivity Service)
 # conf_dict.connsvc_port = 12345
diff --git a/src/drunc/integtest/failure_mode_death_on_boot_top_app_test.py b/src/drunc/integtest/failure_mode_death_on_boot_top_app_test.py
index c90b5edde..0b5ce2486 100644
--- a/src/drunc/integtest/failure_mode_death_on_boot_top_app_test.py
+++ b/src/drunc/integtest/failure_mode_death_on_boot_top_app_test.py
@@ -45,9 +45,8 @@
 conf_dict.op_env = "test"
 
 # Connectivity service configuration
-# Allow drunc to manage ConnectivityService (default is False, integrationtest manages
-# the Connectivity Service)
-conf_dict.drunc_connsvc = True
+# drunc manages the ConnectivityService with a pre-defined dunedaq configuration
+# conf_dict.connsvc_control = data_classes.ConnSvcControl.RUNCONTROL
 # Specify connectivity service port (default is 0, a random port is chosen for the
 # Connectivity Service)
 # conf_dict.connsvc_port = 12345
diff --git a/src/drunc/integtest/failure_mode_death_post_boot_nest_app_test.py b/src/drunc/integtest/failure_mode_death_post_boot_nest_app_test.py
index fd0d144fb..aac1000b8 100644
--- a/src/drunc/integtest/failure_mode_death_post_boot_nest_app_test.py
+++ b/src/drunc/integtest/failure_mode_death_post_boot_nest_app_test.py
@@ -46,9 +46,8 @@
 conf_dict.op_env = "test"
 
 # Connectivity service configuration
-# Allow drunc to manage ConnectivityService (default is False, integrationtest manages
-# the Connectivity Service)
-conf_dict.drunc_connsvc = True
+# drunc manages the ConnectivityService with a pre-defined dunedaq configuration
+# conf_dict.connsvc_control = data_classes.ConnSvcControl.RUNCONTROL
 # Specify connectivity service port (default is 0, a random port is chosen for the
 # Connectivity Service)
 # conf_dict.connsvc_port = 12345
diff --git a/src/drunc/integtest/failure_mode_death_post_boot_top_app_test.py b/src/drunc/integtest/failure_mode_death_post_boot_top_app_test.py
index d99e184f6..b3d309626 100644
--- a/src/drunc/integtest/failure_mode_death_post_boot_top_app_test.py
+++ b/src/drunc/integtest/failure_mode_death_post_boot_top_app_test.py
@@ -46,9 +46,8 @@
 conf_dict.op_env = "test"
 
 # Connectivity service configuration
-# Allow drunc to manage ConnectivityService (default is False, integrationtest manages
-# the Connectivity Service)
-conf_dict.drunc_connsvc = True
+# drunc manages the ConnectivityService with a pre-defined dunedaq configuration
+# conf_dict.connsvc_control = data_classes.ConnSvcControl.RUNCONTROL
 # Specify connectivity service port (default is 0, a random port is chosen for the
 # Connectivity Service)
 # conf_dict.connsvc_port = 12345
diff --git a/src/drunc/integtest/failure_mode_fsm_cmd_death_nest_app_test.py b/src/drunc/integtest/failure_mode_fsm_cmd_death_nest_app_test.py
index cde3c0e19..2ece10ca4 100644
--- a/src/drunc/integtest/failure_mode_fsm_cmd_death_nest_app_test.py
+++ b/src/drunc/integtest/failure_mode_fsm_cmd_death_nest_app_test.py
@@ -45,9 +45,8 @@
 conf_dict.op_env = "test"
 
 # Connectivity service configuration
-# Allow drunc to manage ConnectivityService (default is False, integrationtest manages
-# the Connectivity Service)
-conf_dict.drunc_connsvc = True
+# drunc manages the ConnectivityService with a pre-defined dunedaq configuration
+# conf_dict.connsvc_control = data_classes.ConnSvcControl.RUNCONTROL
 # Specify connectivity service port (default is 0, a random port is chosen for the
 # Connectivity Service)
 # conf_dict.connsvc_port = 12345
diff --git a/src/drunc/integtest/failure_mode_fsm_cmd_death_top_app_test.py b/src/drunc/integtest/failure_mode_fsm_cmd_death_top_app_test.py
index a0b14bcdd..5f5de828c 100644
--- a/src/drunc/integtest/failure_mode_fsm_cmd_death_top_app_test.py
+++ b/src/drunc/integtest/failure_mode_fsm_cmd_death_top_app_test.py
@@ -45,9 +45,8 @@
 conf_dict.op_env = "test"
 
 # Connectivity service configuration
-# Allow drunc to manage ConnectivityService (default is False, integrationtest manages
-# the Connectivity Service)
-conf_dict.drunc_connsvc = True
+# drunc manages the ConnectivityService with a pre-defined dunedaq configuration
+# conf_dict.connsvc_control = data_classes.ConnSvcControl.RUNCONTROL
 # Specify connectivity service port (default is 0, a random port is chosen for the
 # Connectivity Service)
 # conf_dict.connsvc_port = 12345
diff --git a/src/drunc/integtest/failure_mode_fsm_cmd_timeout_nest_app_test.py b/src/drunc/integtest/failure_mode_fsm_cmd_timeout_nest_app_test.py
index 1bbc8a93a..bacfc9084 100644
--- a/src/drunc/integtest/failure_mode_fsm_cmd_timeout_nest_app_test.py
+++ b/src/drunc/integtest/failure_mode_fsm_cmd_timeout_nest_app_test.py
@@ -44,9 +44,8 @@
 conf_dict.op_env = "test"
 
 # Connectivity service configuration
-# Allow drunc to manage ConnectivityService (default is False, integrationtest manages
-# the Connectivity Service)
-conf_dict.drunc_connsvc = True
+# drunc manages the ConnectivityService with a pre-defined dunedaq configuration
+# conf_dict.connsvc_control = data_classes.ConnSvcControl.RUNCONTROL
 # Specify connectivity service port (default is 0, a random port is chosen for the
 # Connectivity Service)
 # conf_dict.connsvc_port = 12345
diff --git a/src/drunc/integtest/failure_mode_fsm_cmd_timeout_top_app_test.py b/src/drunc/integtest/failure_mode_fsm_cmd_timeout_top_app_test.py
index 3b38f279f..d9bb3fbf6 100644
--- a/src/drunc/integtest/failure_mode_fsm_cmd_timeout_top_app_test.py
+++ b/src/drunc/integtest/failure_mode_fsm_cmd_timeout_top_app_test.py
@@ -45,9 +45,8 @@
 conf_dict.op_env = "test"
 
 # Connectivity service configuration
-# Allow drunc to manage ConnectivityService (default is False, integrationtest manages
-# the Connectivity Service)
-conf_dict.drunc_connsvc = True
+# drunc manages the ConnectivityService with a pre-defined dunedaq configuration
+# conf_dict.connsvc_control = data_classes.ConnSvcControl.RUNCONTROL
 # Specify connectivity service port (default is 0, a random port is chosen for the
 # Connectivity Service)
 # conf_dict.connsvc_port = 12345
diff --git a/src/drunc/integtest/process_manager_test.py b/src/drunc/integtest/process_manager_test.py
index 84aa75f5c..d740a0586 100644
--- a/src/drunc/integtest/process_manager_test.py
+++ b/src/drunc/integtest/process_manager_test.py
@@ -47,8 +47,8 @@
 conf_dict.session = "minimal"
 conf_dict.tpg_enabled = False
 
-# For testing, allow drunc to manage ConnectivityService (default is False, integrationtest manages Connectivity Service)
-conf_dict.drunc_connsvc = True
+# Request that drunc manages the ConnectivityService
+conf_dict.connsvc_control = data_classes.ConnSvcControl.RUNCONTROL
 # For testing, specify connectivity service port (default is 0, a random port is chosen for the Connectivity Service)
 # conf_dict.connsvc_port = 12345