diff --git a/src/calng/CalibrationManager.py b/src/calng/CalibrationManager.py
index 9fdeb9e8f4a751352be90dd6f7942226d53ff83e..83ee307098c4d1002a98e768736b20d667e6f0ad 100644
--- a/src/calng/CalibrationManager.py
+++ b/src/calng/CalibrationManager.py
@@ -1151,7 +1151,7 @@ class CalibrationManager(DeviceClientBase, Device):
 
         try:
             msg = await wait_for(instantiate(
-                server, class_id, device_id, config), 5.0)
+                server, class_id, device_id, config), 20.0)
         except AsyncTimeoutError:
             self._set_error(f'Instantiation timeout on {device_id}')
             return False
@@ -1210,6 +1210,7 @@ class CalibrationManager(DeviceClientBase, Device):
         correct_device_id_by_module = {}
         input_source_by_module = {}
 
+        awaitables = []
         for index, row in enumerate(self.modules.value):
             vname, group, aggregator, input_channel, input_source = row
 
@@ -1245,11 +1246,13 @@ class CalibrationManager(DeviceClientBase, Device):
                 if not ismethod(value):
                     config[key] = value
 
-            if not await self._instantiate_device(
-                server_by_group[group], class_ids['correction'], device_id,
-                config
-            ):
-                return
+            awaitables.append(self._instantiate_device(
+                server_by_group[group],
+                class_ids['correction'],
+                device_id,
+                config))
+        await gather(*awaitables)
+        awaitables.clear()
 
         # Instantiate group matchers which can also be bridges.
         for row in self.moduleGroups.value:
@@ -1307,10 +1310,11 @@ class CalibrationManager(DeviceClientBase, Device):
             config['geometryDevice'] = self.geometryDevice.value
             config['maxIdle'] = self.maxIdle.value
 
-            if not await self._instantiate_device(
-                server, class_ids['assembler'], assembler_device_id, config
-            ):
-                return
+            awaitables.append(self._instantiate_device(
+                server, class_ids['assembler'], assembler_device_id, config))
+
+        await gather(*awaitables)
+        awaitables.clear()
 
         self._set_status('All devices instantiated')
         self.state = State.ACTIVE