diff --git a/.github/workflows/graph.yml b/.github/workflows/graph.yml
index d05b09f..af61817 100644
--- a/.github/workflows/graph.yml
+++ b/.github/workflows/graph.yml
@@ -7,9 +7,6 @@ jobs:
   deploy-pools-sepolia:
     runs-on: ubuntu-latest
     environment: graph
-    defaults:
-      run:
-        working-directory: subgraphs/pools
     steps:
       - uses: actions/checkout@v3
       - name: Install node
@@ -19,14 +16,16 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 7
+          version: 8
       - name: Install dependencies
         run: pnpm install
       - name: Generate manifests
         run: pnpm generate-manifests
       - name: Graph Codegen
+        working-directory: subgraphs/pools
         run: pnpm codegen
       - name: Graph Build
+        working-directory: subgraphs/pools
         run: pnpm build
       - uses: balancer-labs/graph-deploy@v0.0.1
         with:
@@ -34,15 +33,12 @@ jobs:
           graph_version_label: ${GITHUB_SHA::8}
           graph_subgraph_name: "balancer-pools-v3-sepolia-7th"
           graph_account: "mendesfabio"
-          graph_config_file: "subgraph.sepolia.yaml"
+          graph_config_file: "subgraphs/pools/subgraph.sepolia.yaml"
           graph_deploy_studio: true
 
   deploy-vault-sepolia:
     runs-on: ubuntu-latest
     environment: graph
-    defaults:
-      run:
-        working-directory: subgraphs/vault
     steps:
       - uses: actions/checkout@v3
       - name: Install node
@@ -52,14 +48,16 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 7
+          version: 8
       - name: Install dependencies
         run: pnpm install
       - name: Generate manifests
         run: pnpm generate-manifests
       - name: Graph Codegen
+        working-directory: subgraphs/vault
         run: pnpm codegen
       - name: Graph Build
+        working-directory: subgraphs/vault
         run: pnpm build
       - uses: balancer-labs/graph-deploy@v0.0.1
         with:
@@ -67,5 +65,5 @@ jobs:
           graph_version_label: ${GITHUB_SHA::8}
           graph_subgraph_name: "balancer-v3-sepolia-7th"
           graph_account: "mendesfabio"
-          graph_config_file: "subgraph.sepolia.yaml"
-          graph_deploy_studio: true
\ No newline at end of file
+          graph_config_file: "subgraphs/vault/subgraph.sepolia.yaml"
+          graph_deploy_studio: true
diff --git a/subgraphs/vault/template.yaml b/subgraphs/vault/template.yaml
index 470cd4c..45011fe 100644
--- a/subgraphs/vault/template.yaml
+++ b/subgraphs/vault/template.yaml
@@ -4,11 +4,11 @@ schema:
 dataSources:
   - kind: ethereum
     name: Vault
-    network: { { network } }
+    network: {{ network }}
     source:
       abi: Vault
       address: "{{ Vault.address }}"
-      startBlock: { { Vault.startBlock } }
+      startBlock: {{ Vault.startBlock }}
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -42,7 +42,7 @@ dataSources:
 templates:
   - kind: ethereum/contract
     name: BPT
-    network: { { network } }
+    network: {{ network }}
     source:
       abi: BPT
     mapping: