diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1776b24..9f96ede 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,13 +17,10 @@ jobs:
         uses: arduino/setup-protoc@v2
         with:
           version: "24.3"
-      - name: bootstrap
-        run: |
-          task apis:bootsrap
-
-      - name: generate
+      - name: all ci steps
         run: |
+          # Note: it is by design that we don't use the builder
+          task apis:bootstrap
           task apis:generate
-     
 
 
diff --git a/Taskfile.yml b/Taskfile.yml
index a49d943..a7d0466 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -67,12 +67,14 @@ tasks:
   ### -------------------------
   # Primary workflow tasks 
   ### -------------------------
-
-  bootstrap:
-    desc: idempotent, run after first clone and after any significant re-base or update
+  all:
+    desc: "do everything necessary after clone (or rebase)"
     cmds:
-      - echo {{.PROTO_INC_ROOT}}
-      # - task apis:fetch-proto-def
+      - task: builder-start
+      - defer: {task: builder-cleanup}
+      # These steps should exactly mirror the steps in .github/workflows/ci.yml
+      - docker exec -t {{.BUILD_CONTAINER}} task apis:bootstrap
+      - docker exec -t {{.BUILD_CONTAINER}} task apis:generate
 
   # 2. generate
   generate:
@@ -80,4 +82,5 @@ tasks:
     cmds:
       - task: builder-start
       - defer: {task: builder-cleanup}
+      # DO NOT add bootstrap here, use all instead
       - docker exec -t {{.BUILD_CONTAINER}} task apis:generate
\ No newline at end of file