diff --git a/pyproject.toml b/pyproject.toml
index bfd55b0cf..cb6daa872 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,7 +13,7 @@ classifiers = [
 ]
 description = "Lightweight Bluesky-as-a-service wrapper application. Also usable as a library."
 dependencies = [
-    "bluesky",
+    "bluesky @ file://dls_sw/p38/software/blueapi/devices_only/bluesky",
     "ophyd",
     "nslsii",
     "pyepics",
@@ -26,7 +26,7 @@ dependencies = [
     "fastapi[all]<0.99",
     "uvicorn",
     "requests",
-    "dls_dodal @ git+https://github.com/DiamondLightSource/dodal.git@rebased_i22",
+    "dls_dodal @ file://dls_sw/p38/software/blueapi/devices_only/dodal",
     "typing_extensions<4.6",
 ]
 dynamic = ["version"]
diff --git a/src/blueapi/core/bluesky_types.py b/src/blueapi/core/bluesky_types.py
index b09a2648d..69145e7e3 100644
--- a/src/blueapi/core/bluesky_types.py
+++ b/src/blueapi/core/bluesky_types.py
@@ -18,7 +18,7 @@
     Triggerable,
     WritesExternalAssets,
 )
-from dls_bluesky_core.core import MsgGenerator, PlanGenerator
+from dodal.common.types import MsgGenerator, PlanGenerator
 from ophyd_async.core import Device as AsyncDevice
 from pydantic import BaseModel, Field
 
diff --git a/src/blueapi/startup/example_plans.py b/src/blueapi/startup/example_plans.py
index 6ec7aa99a..d431f9a15 100644
--- a/src/blueapi/startup/example_plans.py
+++ b/src/blueapi/startup/example_plans.py
@@ -1,9 +1,9 @@
 from typing import List
 
+from bluesky.plan_stubs import mv
+from bluesky.plans import count
 from bluesky.protocols import Movable, Readable
-from dls_bluesky_core.core import inject
-from dls_bluesky_core.plans import count
-from dls_bluesky_core.stubs import move
+from dodal.common import inject
 
 from blueapi.core import MsgGenerator
 
@@ -27,5 +27,5 @@ def stp_snapshot(
     Yields:
         Iterator[MsgGenerator]: Bluesky messages
     """
-    yield from move({temperature: 0, pressure: 10**5})
+    yield from mv({temperature: 0, pressure: 10**5})
     yield from count(detectors, 1)