diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2932271b..da3802d7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -102,7 +102,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          repository: "dcherian/xarray"
+          repository: "pydata/xarray"
           fetch-depth: 0 # Fetch all history for all branches and tags.
       - name: Set up conda environment
         uses: mamba-org/setup-micromamba@v1
@@ -116,7 +116,6 @@ jobs:
             pint>=0.22
       - name: Install xarray
         run: |
-          git checkout flox-preserve-dtype
           python -m pip install --no-deps .
       - name: Install upstream flox
         run: |
diff --git a/ci/environment.yml b/ci/environment.yml
index dac6880a..82995d07 100644
--- a/ci/environment.yml
+++ b/ci/environment.yml
@@ -19,6 +19,7 @@ dependencies:
   - pytest-pretty
   - pytest-xdist
   - syrupy
+  - xarray
   - pre-commit
   - numpy_groupies>=0.9.19
   - pooch
@@ -26,5 +27,3 @@ dependencies:
   - numba
   - numbagg>=0.3
   - hypothesis
-  - pip:
-      - git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
diff --git a/ci/no-dask.yml b/ci/no-dask.yml
index fb2bac92..4978c5bf 100644
--- a/ci/no-dask.yml
+++ b/ci/no-dask.yml
@@ -21,5 +21,4 @@ dependencies:
   - toolz
   - numba
   - numbagg>=0.3
-  - pip:
-      - git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
+  - xarray