diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index d6173e517..780ab1aa9 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -15,6 +15,3 @@ runs:
     - name: Install dependencies
       shell: bash
       run: yarn --immutable
-    - name: Build
-      shell: bash
-      run: yarn build || yarn build
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 407b0e996..f35ed6d37 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,7 @@ name: Build
 
 env:
   CI: true
+  STUDIO_API_KEY: ${{ secrets.STUDIO_API_KEY }}
 
 on:
   push:
@@ -17,4 +18,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Set up environment
-        uses: ./.github/actions/setup
\ No newline at end of file
+        uses: ./.github/actions/setup
+      - name: Build
+        run: yarn build || yarn build
\ No newline at end of file
diff --git a/.github/workflows/ci-contracts.yml b/.github/workflows/ci-contracts.yml
index 388bb8521..421a64b24 100644
--- a/.github/workflows/ci-contracts.yml
+++ b/.github/workflows/ci-contracts.yml
@@ -22,6 +22,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Build
+        run: |
+          pushd packages/contracts
+          yarn build || yarn build
       - name: Run tests
         run: |
           pushd packages/contracts
diff --git a/.github/workflows/ci-data-edge.yml b/.github/workflows/ci-data-edge.yml
index 065e0f964..a8046aa7e 100644
--- a/.github/workflows/ci-data-edge.yml
+++ b/.github/workflows/ci-data-edge.yml
@@ -22,5 +22,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Build
+        run: |
+          pushd packages/data-edge
+          yarn build
       - name: Run tests
         run: yarn test
\ No newline at end of file
diff --git a/.github/workflows/ci-token-dist.yml b/.github/workflows/ci-token-dist.yml
index 76922ff9d..864654227 100644
--- a/.github/workflows/ci-token-dist.yml
+++ b/.github/workflows/ci-token-dist.yml
@@ -2,6 +2,7 @@ name: CI - packages/token-distribution
 
 env:
   CI: true
+  STUDIO_API_KEY: ${{ secrets.STUDIO_API_KEY }}
 
 on:
   push:
@@ -22,5 +23,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Build
+        run: |
+          pushd packages/token-distribution
+          yarn build
       - name: Run tests
         run: yarn test
\ No newline at end of file
diff --git a/.github/workflows/e2e-contracts.yml b/.github/workflows/e2e-contracts.yml
index 46a6387ca..ebb488f45 100644
--- a/.github/workflows/e2e-contracts.yml
+++ b/.github/workflows/e2e-contracts.yml
@@ -32,6 +32,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Build
+        run: |
+          pushd packages/contracts
+          yarn build || yarn build
       - name: Run e2e tests
         run: |
           git clone https://github.com/OffchainLabs/nitro-testnode/
diff --git a/.github/workflows/verifydeployed.yml b/.github/workflows/verifydeployed.yml
index 549d6d7ed..1f5d848d8 100644
--- a/.github/workflows/verifydeployed.yml
+++ b/.github/workflows/verifydeployed.yml
@@ -28,8 +28,10 @@ jobs:
       - name: Set up environment
         uses: ./.github/actions/setup
 
-      - name: Compile contracts
-        run: yarn build
+      - name: Build
+        run: |
+          pushd packages/contracts
+          yarn build || yarn build
 
       - name: Save build artifacts
         uses: actions/upload-artifact@v3
@@ -48,6 +50,10 @@ jobs:
         uses: actions/checkout@v3
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Build
+        run: |
+          pushd packages/contracts
+          yarn build || yarn build
       - name: Get build artifacts
         uses: actions/download-artifact@v3
         with:
diff --git a/packages/token-distribution/.env.sample b/packages/token-distribution/.env.sample
index 1ecb4d424..feae0f5fe 100644
--- a/packages/token-distribution/.env.sample
+++ b/packages/token-distribution/.env.sample
@@ -1,3 +1,4 @@
 MNEMONIC=
 ETHERSCAN_API_KEY=
 INFURA_KEY=
+STUDIO_API_KEY=
diff --git a/packages/token-distribution/.graphclientrc.yml b/packages/token-distribution/.graphclientrc.yml
index 34d67cb06..3ab12d3ca 100644
--- a/packages/token-distribution/.graphclientrc.yml
+++ b/packages/token-distribution/.graphclientrc.yml
@@ -2,13 +2,13 @@ sources:
   - name: graph-network
     handler:
       graphql:
-        endpoint: https://api.thegraph.com/subgraphs/name/graphprotocol/graph-network-mainnet
+        endpoint: https://gateway.thegraph.com/api/${STUDIO_API_KEY}/subgraphs/id/9Co7EQe5PgW3ugCUJrJgRv4u9zdEuDJf8NvMWftNsBH8
         retry: 5
 
   - name: token-distribution
     handler:
       graphql:
-        endpoint: https://api.thegraph.com/subgraphs/name/graphprotocol/token-distribution
+        endpoint: https://gateway.thegraph.com/api/${STUDIO_API_KEY}/subgraphs/id/ChfAJn6jQEBjVqtdUiThfG6sWy2Sr5XQPNucE9DkgXSN
         retry: 5
     transforms:
       - autoPagination: