diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1830b630a2..624aa78cb2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -304,6 +304,7 @@ jobs:
         with:
           repository: getsentry/sentry
           path: sentry
+          ref: hubertdeng123/add-toggle-setup-sentry-gha
 
       - name: Setup steps
         id: setup
@@ -311,19 +312,22 @@ jobs:
           # We cannot execute actions that are not placed under .github of the main repo
           mkdir -p .github/actions
           cp -r sentry/.github/actions/* .github/actions
+          # Move sentry to be a sibling of snuba so devenv can find both
+          mv sentry ../sentry
+          # Create devenv config
+          mkdir -p ~/.config/sentry-devenv
+          echo -e "[devenv]\ncoderoot = $GITHUB_WORKSPACE/.." > ~/.config/sentry-devenv/config.ini
 
       - name: Setup Sentry
         id: setup-sentry
         uses: ./.github/actions/setup-sentry
         with:
-          workdir: sentry
+          workdir: ../sentry
           mode: minimal
+          toggle: snuba
 
       - name: Start snuba
         run: |
-          # TODO(hubertdeng123): New devservices doesn't support running sentry without snuba yet, remove this when it does
-          docker stop snuba-snuba-1
-          docker rm snuba-snuba-1
           docker run -d --rm \
             -p 127.0.0.1:1218:1218 \
             -e PYTHONUNBUFFERED=1 \
@@ -343,7 +347,7 @@ jobs:
 
       - name: Run snuba tests
         if: needs.files-changed.outputs.api_changes == 'false'
-        working-directory: sentry
+        working-directory: ../sentry
         run: |
           pytest -k 'not __In' tests \
             -m snuba_ci \
@@ -351,7 +355,7 @@ jobs:
 
       - name: Run full tests
         if: needs.files-changed.outputs.api_changes == 'true'
-        working-directory: sentry
+        working-directory: ../sentry
         run: |
           pytest -k 'not __In' \
               tests/snuba \
@@ -373,7 +377,7 @@ jobs:
 
       - name: Run CI module tests
         if: needs.files-changed.outputs.api_changes == 'true'
-        working-directory: sentry
+        working-directory: ../sentry
         run: pytest -k 'not __In' tests -vv -m snuba_ci
 
   clickhouse-versions: