diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0d4277c..bba731e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -73,9 +73,11 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
 
       - name: Set up QEMU
+        if: steps.changes.outputs.images == 'true'
         uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
+        if: steps.changes.outputs.images == 'true'
         uses: docker/setup-buildx-action@v3
 
       - name: "🔨 Build Ponder docker dependencies"
diff --git a/iac/Indexer.ts b/iac/Indexer.ts
index 057e6bc..ad09bca 100644
--- a/iac/Indexer.ts
+++ b/iac/Indexer.ts
@@ -46,15 +46,15 @@ export function IndexerStack({ app, stack }: StackContext) {
     });
 
     // Then add the erpc service
-    //const erpcService = addErpcService({ stack, app, vpc, cluster });
+    const erpcService = addErpcService({ stack, app, vpc, cluster });
 
     // Add the indexer service
     const indexerService = addIndexerService({ stack, app, vpc, cluster });
 
     // If we are missing the fargate services, early exit
     const indexerFaragateService = indexerService.cdk?.fargateService;
-    // const erpcFargateService = erpcService.cdk?.fargateService;
-    if (!(indexerFaragateService)) {
+    const erpcFargateService = erpcService.cdk?.fargateService;
+    if (!(indexerFaragateService && erpcFargateService)) {
         throw new Error(
             "Missing fargate service in the indexer or erpc service"
         );