diff --git a/environment.yml b/environment.yml
index f100c2ee..31b77bd9 100644
--- a/environment.yml
+++ b/environment.yml
@@ -17,9 +17,9 @@ variables:
 
 channels:
   - conda-forge
-  - defaults
   - aps-anl-tag
   - nsls2forge
+  - nodefaults
 
 dependencies:
   # --- Python core packages
@@ -56,7 +56,7 @@ dependencies:
     - bluesky-adaptive
     - bluesky >=1.8.1
     - ophyd >=1.6.3
-    - ophyd-async >= 0.5.1
+    - ophyd-async >= 0.6.0
     - apstools >= 1.6.20
     - pcdsdevices  # For extra signal types
     - pydm >=1.18.0
diff --git a/src/haven/instrument/motor.py b/src/haven/instrument/motor.py
index 6afcf19d..1140a6d8 100644
--- a/src/haven/instrument/motor.py
+++ b/src/haven/instrument/motor.py
@@ -6,10 +6,10 @@
 from ophyd import Component as Cpt
 from ophyd import EpicsMotor, EpicsSignal, EpicsSignalRO, Kind
 from ophyd_async.core import (
+    CALCULATE_TIMEOUT,
     DEFAULT_TIMEOUT,
     AsyncStatus,
     CalculatableTimeout,
-    CalculateTimeout,
     ConfigSignal,
     SignalBackend,
     SignalX,
@@ -36,10 +36,10 @@ def __init__(self, *args, trigger_value=1, **kwargs):
         super().__init__(*args, **kwargs)
 
     def trigger(
-        self, wait=False, timeout: CalculatableTimeout = CalculateTimeout
+        self, wait=False, timeout: CalculatableTimeout = CALCULATE_TIMEOUT
     ) -> AsyncStatus:
         """Trigger the action and return a status saying when it's done"""
-        if timeout is CalculateTimeout:
+        if timeout is CALCULATE_TIMEOUT:
             timeout = self._timeout
         coro = self._backend.put(self.trigger_value, wait=wait, timeout=timeout)
         return AsyncStatus(coro)
diff --git a/src/haven/instrument/srs570.py b/src/haven/instrument/srs570.py
index c67d05ba..676907d4 100644
--- a/src/haven/instrument/srs570.py
+++ b/src/haven/instrument/srs570.py
@@ -24,9 +24,9 @@
 from typing import Optional, Type
 
 from ophyd_async.core import (
+    CALCULATE_TIMEOUT,
     AsyncStatus,
     CalculatableTimeout,
-    CalculateTimeout,
     Device,
     SignalRW,
     SubsetEnum,
@@ -162,7 +162,7 @@ async def calculate_settle_time(self, value):
 
     @AsyncStatus.wrap
     async def set(
-        self, value: T, wait=True, timeout: CalculatableTimeout = CalculateTimeout
+        self, value: T, wait=True, timeout: CalculatableTimeout = CALCULATE_TIMEOUT
     ) -> AsyncStatus:
         aw = super().set(value=value, wait=wait, timeout=timeout)
         if wait: