diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index fbd8620..f9a5ba7 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -71,21 +71,9 @@ jobs:
     steps:
       - name: Maximize build space
         uses: ublue-os/remove-unwanted-software@v6
-        env:
-          EARTHLY_SAT_TOKEN: ${{ secrets.EARTHLY_SAT_TOKEN }}
-        if: env.EARTHLY_SAT_TOKEN == null
 
       - uses: earthly/actions-setup@v1
 
-      - name: Earthly login
-        env:
-          EARTHLY_SAT_TOKEN: ${{ secrets.EARTHLY_SAT_TOKEN }}
-        if: env.EARTHLY_SAT_TOKEN != null
-        run: |
-          earthly account login --token ${{ secrets.EARTHLY_SAT_TOKEN }} >> /dev/null
-          earthly org s blue-build
-          earthly sat s integration-tests
-
       # Setup repo and add caching
       - uses: actions/checkout@v4
         with:
@@ -94,7 +82,9 @@ jobs:
           repository: ${{github.event.pull_request.head.repo.full_name}}
 
       - name: Run integration tests
-        run: earthly --ci -P ./integration-tests+all
+        run: |
+          earthly bootstrap
+          earthly --ci -P ./integration-tests+all
 
   docker-build:
     timeout-minutes: 60
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 67920a4..cfe6713 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,21 +70,9 @@ jobs:
     steps:
       - name: Maximize build space
         uses: ublue-os/remove-unwanted-software@v6
-        env:
-          EARTHLY_SAT_TOKEN: ${{ secrets.EARTHLY_SAT_TOKEN }}
-        if: env.EARTHLY_SAT_TOKEN == null
 
       - uses: earthly/actions-setup@v1
 
-      - name: Earthly login
-        env:
-          EARTHLY_SAT_TOKEN: ${{ secrets.EARTHLY_SAT_TOKEN }}
-        if: env.EARTHLY_SAT_TOKEN != null
-        run: |
-          earthly account login --token ${{ secrets.EARTHLY_SAT_TOKEN }} >> /dev/null
-          earthly org s blue-build
-          earthly sat s integration-tests
-
       # Setup repo and add caching
       - uses: actions/checkout@v4
         with:
@@ -92,7 +80,9 @@ jobs:
 
       - name: Run integration tests
         if: github.repository == 'blue-build/cli'
-        run: earthly --ci -P ./integration-tests+all
+        run: |
+          earthly bootstrap
+          earthly --ci -P ./integration-tests+all
 
   docker-build:
     timeout-minutes: 60