diff --git a/setup.cfg b/setup.cfg
index 397a34fe7..6f80e464e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ package_dir =
 install_requires =
     bluesky
     pyepics
-    blueapi @ git+https://github.com/Tom-Willemsen/blueapi@unpin_dodal
+    blueapi @ git+https://github.com/DiamondLightSource/blueapi@main
     flask-restful
     zocalo
     ispyb
@@ -36,7 +36,7 @@ install_requires =
     xarray
     doct
     databroker
-    dodal @ git+https://github.com/DiamondLightSource/python-dodal.git@af63f5cf6742e094faac298396e2c16b422bcc8e
+    dls-dodal
     pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774
 
 
diff --git a/src/hyperion/utils/context.py b/src/hyperion/utils/context.py
index 2fa864af7..b16262c31 100644
--- a/src/hyperion/utils/context.py
+++ b/src/hyperion/utils/context.py
@@ -8,7 +8,7 @@
 # away once we fully use blueapi's plan management components.
 # https://github.com/DiamondLightSource/hyperion/issues/868
 from dodal.beamlines.beamline_utils import _wait_for_connection
-from dodal.utils import get_beamline_based_on_environment_variable, make_all_devices
+from dodal.utils import get_beamline_based_on_environment_variable
 
 import hyperion.experiment_plans as hyperion_plans
 from hyperion.log import LOGGER
@@ -78,14 +78,10 @@ def setup_context(
     context = BlueskyContext()
     context.with_plan_module(hyperion_plans)
 
-    # Ideally would use context.with_dodal_module, but it doesn't support
-    # passing through wait_for_connection or fake_with_ophyd_sim
-    # See https://github.com/DiamondLightSource/blueapi/pull/304
-    for name, device in make_all_devices(
+    context.with_dodal_module(
         get_beamline_based_on_environment_variable(),
         wait_for_connection=wait_for_connection,
         fake_with_ophyd_sim=fake_with_ophyd_sim,
-    ).items():
-        context.device(device, name=name)
+    )
 
     return context