diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 662b82b..12273fb 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -4,32 +4,34 @@ options:
 timeout: 1800s
 
 steps:
-  - id: 'Checkout Kustomize Configuration'
-    name: 'gcr.io/cloud-builders/git'
-    env:
-      - 'GIT_AUTH_TOKEN=$_GITHUB_GRAPHIX_INFRA_PAT'
+  # Set the project ID
+  - name: 'gcr.io/cloud-builders/gcloud'
+    args: ['config', 'set', 'project', 'graph-mainnet']
+
+  # Authenticate to GKE cluster
+  - name: 'gcr.io/cloud-builders/gcloud'
     args:
-      - 'clone'
-      - 'https://github.com/edgeandnode/graph-infra.git'
+      - 'container'
+      - 'clusters'
+      - 'get-credentials'
+      - 'testnet'
+      - '--zone=us-central1-a'
+      - '--project=graph-mainnet'
 
-  - id: 'Update Graphix Deployment'
-    name: 'gcr.io/cloud-builders/kubectl'
-    env:
-      - "CLOUDSDK_COMPUTE_ZONE=us-central1-a"
-      - "CLOUDSDK_CONTAINER_CLUSTER=testnet"
-      - "CLOUDSDK_CORE_PROJECT=graph-mainnet"
+  # Update the deployment to use the latest image
+  - name: 'gcr.io/cloud-builders/kubectl'
     args:
-      - 'apply'
-      - '-k'
-      - 'graph-infra/graph-mainnet/testnet/k8s/graphix/environments/'
+      - 'set'
+      - 'image'
+      - 'deployment/graphix-cross-checker'
+      - 'graphix-cross-checker=ghcr.io/${_GITHUB_REPO_OWNER}/graphix:latest'
 
-  - id: 'Restart Graphix Deployment'
-    name: 'gcr.io/cloud-builders/kubectl'
-    env:
-      - "CLOUDSDK_COMPUTE_ZONE=us-central1-a"
-      - "CLOUDSDK_CONTAINER_CLUSTER=testnet"
-      - "CLOUDSDK_CORE_PROJECT=graph-mainnet"
+  # Restart the deployment
+  - name: 'gcr.io/cloud-builders/kubectl'
     args:
       - 'rollout'
       - 'restart'
       - 'deployment/graphix-cross-checker'
+
+substitutions:
+  _GITHUB_REPO_OWNER: 'edgeandnode'
diff --git a/crates/indexer_client/graphql/indexer/schema.gql b/crates/indexer_client/graphql/indexer/schema.gql
index 4d7e067..26b5f61 100644
--- a/crates/indexer_client/graphql/indexer/schema.gql
+++ b/crates/indexer_client/graphql/indexer/schema.gql
@@ -70,8 +70,12 @@ type SubgraphIndexingStatus {
   nonFatalErrors: [SubgraphError!]!
   chains: [ChainIndexingStatus!]!
   entityCount: BigInt!
+
+  "null if deployment is not assigned to an indexing node"
   node: String
-  paused: Boolean!
+  "null if deployment is not assigned to an indexing node"
+  paused: Boolean
+
   historyBlocks: Int!
 }