diff --git a/.github/workflows/cloud-runner-local-pipeline.yml b/.github/workflows/cloud-runner-local-pipeline.yml
index 84c4ac08..f44198bf 100644
--- a/.github/workflows/cloud-runner-local-pipeline.yml
+++ b/.github/workflows/cloud-runner-local-pipeline.yml
@@ -85,12 +85,11 @@ jobs:
       - run: |
           mv ./cloud-runner-cache/${{ steps.unity-build.outputs.CACHE_KEY }}/build/build-${{ steps.unity-build.outputs.BUILD_GUID }}.tar.lz4 build-${{ steps.unity-build.outputs.BUILD_GUID }}.tar.lz4
           ls
-      - run: yarn run cli -m list-resources
       ###########################
       #          Upload         #
       ###########################
       - uses: actions/upload-artifact@v2
         with:
-          name: AWS Build (${{ matrix.targetPlatform }})
+          name: Local Build (${{ matrix.targetPlatform }})
           path: build-${{ steps.unity-build.outputs.BUILD_GUID }}.tar.lz4
           retention-days: 14
diff --git a/.github/workflows/cloud-runner-pipeline.yml b/.github/workflows/cloud-runner-pipeline.yml
index 70a8a8f0..4f3b6672 100644
--- a/.github/workflows/cloud-runner-pipeline.yml
+++ b/.github/workflows/cloud-runner-pipeline.yml
@@ -1,7 +1,7 @@
 name: Cloud Runner CI Pipeline
 
 on:
-  push: { branches: [cloud-runner-develop, cloud-runner-preview] }
+  push: { branches: [cloud-runner-develop, cloud-runner-preview, main] }
 
 env:
   GKE_ZONE: 'us-central1'
diff --git a/dist/index.js b/dist/index.js
index 13bdcbc8..3164940e 100644
Binary files a/dist/index.js and b/dist/index.js differ
diff --git a/dist/index.js.map b/dist/index.js.map
index ce98514a..ce190eee 100644
Binary files a/dist/index.js.map and b/dist/index.js.map differ
diff --git a/src/model/cloud-runner/providers/aws/services/task-service.ts b/src/model/cloud-runner/providers/aws/services/task-service.ts
index 45c85466..d8ba36f2 100644
--- a/src/model/cloud-runner/providers/aws/services/task-service.ts
+++ b/src/model/cloud-runner/providers/aws/services/task-service.ts
@@ -16,6 +16,7 @@ export class TaskService {
     return output;
   }
   public static async awsListStacks(perResultCallback: any = false) {
+    CloudRunnerLogger.log(`List Stacks`);
     process.env.AWS_REGION = Input.region;
     const CF = new AWS.CloudFormation();
     const stacks =
@@ -55,6 +56,7 @@ export class TaskService {
     }
   }
   public static async awsListTasks(perResultCallback: any = false) {
+    CloudRunnerLogger.log(`List Tasks`);
     process.env.AWS_REGION = Input.region;
     const ecs = new AWS.ECS();
     const clusters = (await ecs.listClusters().promise()).clusterArns || [];
@@ -88,6 +90,7 @@ export class TaskService {
     }
   }
   public static async awsListJobs(perResultCallback: any = false) {
+    CloudRunnerLogger.log(`List Jobs`);
     process.env.AWS_REGION = Input.region;
     const CF = new AWS.CloudFormation();
     const stacks =
diff --git a/src/model/cloud-runner/providers/k8s/index.ts b/src/model/cloud-runner/providers/k8s/index.ts
index d8a345e5..bc427e20 100644
--- a/src/model/cloud-runner/providers/k8s/index.ts
+++ b/src/model/cloud-runner/providers/k8s/index.ts
@@ -155,8 +155,14 @@ class Kubernetes implements ProviderInterface {
             CloudRunnerLogger.log('Pod still running, recovering stream...');
           }
         } catch (error: any) {
-          const reason = error.response?.body?.reason || error.reason || ``;
-          const errorMessage = error.message || ``;
+          let errorParsed;
+          try {
+            errorParsed = JSON.parse(error);
+          } catch {
+            errorParsed = error;
+          }
+          const reason = errorParsed.reason || errorParsed.response?.body?.reason || ``;
+          const errorMessage = errorParsed.message || ``;
 
           const continueStreaming = reason === `NotFound` || errorMessage.includes(`dial timeout, backstop`);
           if (continueStreaming) {