diff --git a/packages/indexer-agent/src/agent.ts b/packages/indexer-agent/src/agent.ts
index 49729b84a..9bd8f1a44 100644
--- a/packages/indexer-agent/src/agent.ts
+++ b/packages/indexer-agent/src/agent.ts
@@ -281,33 +281,36 @@ export class Agent {
       },
     )
 
-    const indexingRules: Eventual< NetworkMapped<GeneratedGraphQLTypes.IndexingRule[]>> =
-      timer(requestIntervalSmall).tryMap(
-        async () => {
-          return this.multiNetworks.map(async ({ network, operator }) => {
-            logger.trace('Fetching indexing rules', {
-              protocolNetwork: network.specification.networkIdentifier,
-            })
-            let rules = await operator.indexingRules(true)
-            const subgraphRuleIds = rules
-              .filter(
-                rule => rule.identifierType == GeneratedGraphQLTypes.IdentifierType.subgraph,
-              )
-              .map(rule => rule.identifier!)
-            const subgraphsMatchingRules =
-              await network.networkMonitor.subgraphs(subgraphRuleIds)
-            if (subgraphsMatchingRules.length >= 1) {
-              const epochLength =
-                await network.contracts.epochManager.epochLength()
-              const blockPeriod = 15
-              const bufferPeriod = epochLength.toNumber() * blockPeriod * 100 // 100 epochs
-              rules = convertSubgraphBasedRulesToDeploymentBased(
-                rules,
-                subgraphsMatchingRules,
-                bufferPeriod,
-              )
-            }
-            return rules
+    const indexingRules: Eventual<
+      NetworkMapped<GeneratedGraphQLTypes.IndexingRule[]>
+    > = timer(requestIntervalSmall).tryMap(
+      async () => {
+        return this.multiNetworks.map(async ({ network, operator }) => {
+          logger.trace('Fetching indexing rules', {
+            protocolNetwork: network.specification.networkIdentifier,
+          })
+          let rules = await operator.indexingRules(true)
+          const subgraphRuleIds = rules
+            .filter(
+              rule =>
+                rule.identifierType ==
+                GeneratedGraphQLTypes.IdentifierType.subgraph,
+            )
+            .map(rule => rule.identifier!)
+          const subgraphsMatchingRules =
+            await network.networkMonitor.subgraphs(subgraphRuleIds)
+          if (subgraphsMatchingRules.length >= 1) {
+            const epochLength =
+              await network.contracts.epochManager.epochLength()
+            const blockPeriod = 15
+            const bufferPeriod = epochLength.toNumber() * blockPeriod * 100 // 100 epochs
+            rules = convertSubgraphBasedRulesToDeploymentBased(
+              rules,
+              subgraphsMatchingRules,
+              bufferPeriod,
+            )
+          }
+          return rules
         })
       },
       {
diff --git a/packages/indexer-agent/src/types.ts b/packages/indexer-agent/src/types.ts
index f71f9d295..5a8b38ae5 100644
--- a/packages/indexer-agent/src/types.ts
+++ b/packages/indexer-agent/src/types.ts
@@ -3,7 +3,7 @@ import {
   Network,
   GraphNode,
   DeploymentManagementMode,
-  IndexerManagementClient,
+  IndexerManagementYogaClient,
   Operator,
 } from '@graphprotocol/indexer-common'
 
@@ -19,7 +19,7 @@ export interface AgentConfigs {
   metrics: Metrics
   graphNode: GraphNode
   operators: Operator[]
-  indexerManagement: IndexerManagementClient
+  indexerManagement: IndexerManagementYogaClient
   networks: Network[]
   deploymentManagement: DeploymentManagementMode
   autoMigrationSupport: boolean
diff --git a/packages/indexer-cli/src/allocations.ts b/packages/indexer-cli/src/allocations.ts
index 63dfc66bb..083c60195 100644
--- a/packages/indexer-cli/src/allocations.ts
+++ b/packages/indexer-cli/src/allocations.ts
@@ -313,7 +313,7 @@ export const reallocateAllocation = async (
 }
 
 export const submitCollectReceiptsJob = async (
-  client: IndexerManagementClient,
+  client: Client,
   allocationID: string,
   protocolNetwork: string,
 ): Promise<void> => {