diff --git a/.github/workflows/graph-studio.yml b/.github/workflows/graph-studio.yml
index eb06a0b7..224643a9 100644
--- a/.github/workflows/graph-studio.yml
+++ b/.github/workflows/graph-studio.yml
@@ -5,131 +5,131 @@ on:
     branches: master
 
 jobs:
-  # deploy-studio-mainnet:
-  #   runs-on: ubuntu-latest
-  #   environment: graph
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Install node
-  #       uses: actions/setup-node@v1
-  #       with:
-  #         node-version: 16
-  #     - name: Install
-  #       run: yarn --frozen-lockfile
-  #     - name: Assets
-  #       run: yarn generate-assets
-  #     - name: Codegen
-  #       run: yarn codegen
-  #     - name: Build
-  #       run: yarn build
-  #     - uses: gtaschuk/graph-deploy@v0.1.11
-  #       with:
-  #         graph_deploy_key: ${{secrets.GRAPH_DEPLOY_KEY}}
-  #         graph_version_label: ${GITHUB_SHA::8}
-  #         graph_subgraph_name: "balancer-v2"
-  #         graph_account: "balancer-labs"
-  #         graph_config_file: "subgraph.yaml"
-  #         graph_deploy_studio: true
-  # deploy-studio-base-testnet:
-  #   runs-on: ubuntu-latest
-  #   environment: graph
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Install node
-  #       uses: actions/setup-node@v1
-  #       with:
-  #         node-version: 16
-  #     - name: Install
-  #       run: yarn --frozen-lockfile
-  #     - name: Assets
-  #       run: yarn generate-assets
-  #     - name: Codegen
-  #       run: yarn codegen
-  #     - name: Build
-  #       run: yarn build
-  #     - uses: gtaschuk/graph-deploy@v0.1.11
-  #       with:
-  #         graph_deploy_key: ${{secrets.GRAPH_DEPLOY_KEY}}
-  #         graph_version_label: ${GITHUB_SHA::8}
-  #         graph_subgraph_name: "balancer-base-testnet-v2"
-  #         graph_account: "balancer-labs"
-  #         graph_config_file: "subgraph.basegoerli.yaml"
-  #         graph_deploy_studio: true
-  # deploy-studio-sepolia:
-  #   runs-on: ubuntu-latest
-  #   environment: graph
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Install node
-  #       uses: actions/setup-node@v1
-  #       with:
-  #         node-version: 16
-  #     - name: Install
-  #       run: yarn --frozen-lockfile
-  #     - name: Assets
-  #       run: yarn generate-assets sepolia
-  #     - name: Codegen
-  #       run: yarn codegen
-  #     - name: Build
-  #       run: yarn build
-  #     - uses: gtaschuk/graph-deploy@v0.1.11
-  #       with:
-  #         graph_deploy_key: ${{secrets.GRAPH_DEPLOY_KEY}}
-  #         graph_version_label: ${GITHUB_SHA::8}
-  #         graph_subgraph_name: "balancer-sepolia-v2"
-  #         graph_account: "balancer-labs"
-  #         graph_config_file: "subgraph.sepolia.yaml"
-  #         graph_deploy_studio: true
-  # deploy-studio-polygon-zkevm:
-  #   runs-on: ubuntu-latest
-  #   environment: graph
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Install node
-  #       uses: actions/setup-node@v1
-  #       with:
-  #         node-version: 16
-  #     - name: Install
-  #       run: yarn --frozen-lockfile
-  #     - name: Assets
-  #       run: yarn generate-assets polygon-zkevm
-  #     - name: Codegen
-  #       run: yarn codegen
-  #     - name: Build
-  #       run: yarn build
-  #     - uses: gtaschuk/graph-deploy@v0.1.11
-  #       with:
-  #         graph_deploy_key: ${{secrets.GRAPH_DEPLOY_KEY}}
-  #         graph_version_label: ${GITHUB_SHA::8}
-  #         graph_subgraph_name: "balancer-polygon-zk-v2"
-  #         graph_account: "balancer-labs"
-  #         graph_config_file: "subgraph.polygon-zkevm.yaml"
-  #         graph_deploy_studio: true
-  # deploy-studio-base:
-  #   runs-on: ubuntu-latest
-  #   environment: graph
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Install node
-  #       uses: actions/setup-node@v1
-  #       with:
-  #         node-version: 16
-  #     - name: Install
-  #       run: yarn --frozen-lockfile
-  #     - name: Assets
-  #       run: yarn generate-assets base
-  #     - name: Codegen
-  #       run: yarn codegen
-  #     - name: Build
-  #       run: yarn build
-  #     - uses: gtaschuk/graph-deploy@v0.1.11
-  #       with:
-  #         graph_deploy_key: ${{secrets.GRAPH_DEPLOY_KEY}}
-  #         graph_version_label: ${GITHUB_SHA::8}
-  #         graph_subgraph_name: "balancer-base-v2"
-  #         graph_account: "balancer-labs"
-  #         graph_config_file: "subgraph.base.yaml"
-  #         graph_deploy_studio: true
+  deploy-studio-mainnet:
+    runs-on: ubuntu-latest
+    environment: graph
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+      - name: Install
+        run: yarn --frozen-lockfile
+      - name: Assets
+        run: yarn generate-assets
+      - name: Codegen
+        run: yarn codegen
+      - name: Build
+        run: yarn build
+      - uses: gtaschuk/graph-deploy@v0.1.11
+        with:
+          graph_deploy_key: ${{secrets.GRAPH_DEPLOY_KEY}}
+          graph_version_label: ${GITHUB_SHA::8}
+          graph_subgraph_name: "balancer-v2"
+          graph_account: "balancer-labs"
+          graph_config_file: "subgraph.yaml"
+          graph_deploy_studio: true
+  deploy-studio-base-testnet:
+    runs-on: ubuntu-latest
+    environment: graph
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+      - name: Install
+        run: yarn --frozen-lockfile
+      - name: Assets
+        run: yarn generate-assets
+      - name: Codegen
+        run: yarn codegen
+      - name: Build
+        run: yarn build
+      - uses: gtaschuk/graph-deploy@v0.1.11
+        with:
+          graph_deploy_key: ${{secrets.GRAPH_DEPLOY_KEY}}
+          graph_version_label: ${GITHUB_SHA::8}
+          graph_subgraph_name: "balancer-base-testnet-v2"
+          graph_account: "balancer-labs"
+          graph_config_file: "subgraph.basegoerli.yaml"
+          graph_deploy_studio: true
+  deploy-studio-sepolia:
+    runs-on: ubuntu-latest
+    environment: graph
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+      - name: Install
+        run: yarn --frozen-lockfile
+      - name: Assets
+        run: yarn generate-assets sepolia
+      - name: Codegen
+        run: yarn codegen
+      - name: Build
+        run: yarn build
+      - uses: gtaschuk/graph-deploy@v0.1.11
+        with:
+          graph_deploy_key: ${{secrets.GRAPH_DEPLOY_KEY}}
+          graph_version_label: ${GITHUB_SHA::8}
+          graph_subgraph_name: "balancer-sepolia-v2"
+          graph_account: "balancer-labs"
+          graph_config_file: "subgraph.sepolia.yaml"
+          graph_deploy_studio: true
+  deploy-studio-polygon-zkevm:
+    runs-on: ubuntu-latest
+    environment: graph
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+      - name: Install
+        run: yarn --frozen-lockfile
+      - name: Assets
+        run: yarn generate-assets polygon-zkevm
+      - name: Codegen
+        run: yarn codegen
+      - name: Build
+        run: yarn build
+      - uses: gtaschuk/graph-deploy@v0.1.11
+        with:
+          graph_deploy_key: ${{secrets.GRAPH_DEPLOY_KEY}}
+          graph_version_label: ${GITHUB_SHA::8}
+          graph_subgraph_name: "balancer-polygon-zk-v2"
+          graph_account: "balancer-labs"
+          graph_config_file: "subgraph.polygon-zkevm.yaml"
+          graph_deploy_studio: true
+  deploy-studio-base:
+    runs-on: ubuntu-latest
+    environment: graph
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+      - name: Install
+        run: yarn --frozen-lockfile
+      - name: Assets
+        run: yarn generate-assets base
+      - name: Codegen
+        run: yarn codegen
+      - name: Build
+        run: yarn build
+      - uses: gtaschuk/graph-deploy@v0.1.11
+        with:
+          graph_deploy_key: ${{secrets.GRAPH_DEPLOY_KEY}}
+          graph_version_label: ${GITHUB_SHA::8}
+          graph_subgraph_name: "balancer-base-v2"
+          graph_account: "balancer-labs"
+          graph_config_file: "subgraph.base.yaml"
+          graph_deploy_studio: true
 
 env:
   CI: true
diff --git a/.github/workflows/graph.yml b/.github/workflows/graph.yml
index 6e72dd49..472f65dc 100644
--- a/.github/workflows/graph.yml
+++ b/.github/workflows/graph.yml
@@ -51,52 +51,52 @@ jobs:
           graph_subgraph_name: "balancer-v2"
           graph_account: "balancer-labs"
           graph_config_file: "subgraph.yaml"
-  # deploy-polygon:
-  #   runs-on: ubuntu-latest
-  #   environment: graph
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Install node
-  #       uses: actions/setup-node@v1
-  #       with:
-  #         node-version: 16
-  #     - name: Install
-  #       run: yarn --frozen-lockfile
-  #     - name: Assets
-  #       run: yarn generate-assets polygon
-  #     - name: Codegen
-  #       run: yarn codegen
-  #     - name: Build
-  #       run: yarn build
-  #     - uses: balancer-labs/graph-deploy@v0.0.1
-  #       with:
-  #         graph_access_token: ${{secrets.GRAPH_ACCESS_TOKEN}}
-  #         graph_subgraph_name: "balancer-polygon-v2"
-  #         graph_account: "balancer-labs"
-  #         graph_config_file: "subgraph.polygon.yaml"
-  # deploy-polygon-pruned:
-  #   runs-on: ubuntu-latest
-  #   environment: graph
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Install node
-  #       uses: actions/setup-node@v1
-  #       with:
-  #         node-version: 16
-  #     - name: Install
-  #       run: yarn --frozen-lockfile
-  #     - name: Assets
-  #       run: yarn generate-assets polygon-prune
-  #     - name: Codegen
-  #       run: yarn codegen
-  #     - name: Build
-  #       run: yarn build
-  #     - uses: balancer-labs/graph-deploy@v0.0.1
-  #       with:
-  #         graph_access_token: ${{secrets.GRAPH_ACCESS_TOKEN}}
-  #         graph_subgraph_name: "balancer-polygon-prune-v2"
-  #         graph_account: "balancer-labs"
-  #         graph_config_file: "subgraph.polygon.pruned.yaml"
+  deploy-polygon:
+    runs-on: ubuntu-latest
+    environment: graph
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+      - name: Install
+        run: yarn --frozen-lockfile
+      - name: Assets
+        run: yarn generate-assets polygon
+      - name: Codegen
+        run: yarn codegen
+      - name: Build
+        run: yarn build
+      - uses: balancer-labs/graph-deploy@v0.0.1
+        with:
+          graph_access_token: ${{secrets.GRAPH_ACCESS_TOKEN}}
+          graph_subgraph_name: "balancer-polygon-v2"
+          graph_account: "balancer-labs"
+          graph_config_file: "subgraph.polygon.yaml"
+  deploy-polygon-pruned:
+    runs-on: ubuntu-latest
+    environment: graph
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+      - name: Install
+        run: yarn --frozen-lockfile
+      - name: Assets
+        run: yarn generate-assets polygon-prune
+      - name: Codegen
+        run: yarn codegen
+      - name: Build
+        run: yarn build
+      - uses: balancer-labs/graph-deploy@v0.0.1
+        with:
+          graph_access_token: ${{secrets.GRAPH_ACCESS_TOKEN}}
+          graph_subgraph_name: "balancer-polygon-prune-v2"
+          graph_account: "balancer-labs"
+          graph_config_file: "subgraph.polygon.pruned.yaml"
   deploy-arbitrum:
     runs-on: ubuntu-latest
     environment: graph