diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 972cd72..8d8dd00 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -232,44 +232,11 @@ jobs:
       release_created: ${{ steps.release.outputs.release_created }}
       #if a release is created then run the deploy scripts for github.io, conda, pypi and docker
 
-  documentation-test:
-    runs-on: ubuntu-24.04
-    
-    steps:
-      - uses: actions/checkout@v4
-      - run: |
-          cp CHANGELOG.md docs/source/CHANGELOG.md
-          docker build . -t=docs -f docs/Dockerfile 
-          docker run -v $(pwd):/map2loop docs bash map2loop/docs/build_docs.sh
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: docs
-          path: docs/build/html
 
-  documentation-deploy:
-    runs-on: ubuntu-24.04
-    needs: [release-please, documentation-test]
-    if: ${{ needs.release-please.outputs.release_created }} && github.ref == 'refs/heads/master'
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
-        with:
-          name: docs
-          path: docs
-      - name: ls
-        run: |
-          ls -l docs
-      - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          branch: gh-pages # The branch the action should deploy to.
-          folder: docs # The folder the action should deploy.
   
   conda-upload:
-    needs: [conda-build]
-    if: github.ref == 'refs/heads/master'
+    needs: [release-please, conda-build]
+
     runs-on: ${{matrix.os}}
     strategy:
       fail-fast: false
@@ -279,7 +246,7 @@ jobs:
           # - macos-latest
           - windows-latest
         python-version: ["3.9", "3.10", "3.11", "3.12"]
-    # if: ${{ needs.release-please.outputs.release_created }}
+    if: ${{ needs.release-please.outputs.release_created }}
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -301,7 +268,7 @@ jobs:
     needs: [pypi-test-wheels]
     if: github.ref == 'refs/heads/master'
     runs-on:
-      - ubuntu-24.04  # https://github.com/actions/runner-images/issues/10636
+      - ubuntu-24.04  
     # if: ${{ needs.release-please.outputs.release_created }}
     permissions:
       # IMPORTANT: this permission is mandatory for trusted publishing
@@ -315,3 +282,38 @@ jobs:
         with:
           skip-existing: true
           verbose: true
+
+  documentation-test:
+    runs-on: ubuntu-24.04
+    
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          cp CHANGELOG.md docs/source/CHANGELOG.md
+          docker build . -t=docs -f docs/Dockerfile 
+          docker run -v $(pwd):/map2loop docs bash map2loop/docs/build_docs.sh
+      - name: upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs
+          path: docs/build/html
+
+  documentation-deploy:
+    runs-on: ubuntu-24.04
+    needs: [release-please, documentation-test]
+    if: ${{ needs.release-please.outputs.release_created }} && github.ref == 'refs/heads/master'
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          name: docs
+          path: docs
+      - name: ls
+        run: |
+          ls -l docs
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          branch: gh-pages # The branch the action should deploy to.
+          folder: docs # The folder the action should deploy.
\ No newline at end of file