diff --git a/dist/index.js b/dist/index.js
index ae2683ca..386a8107 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 e865f618..07404dbd 100644
Binary files a/dist/index.js.map and b/dist/index.js.map differ
diff --git a/src/model/cloud-runner/cloud-runner.ts b/src/model/cloud-runner/cloud-runner.ts
index 671c7560..5c9b7dae 100644
--- a/src/model/cloud-runner/cloud-runner.ts
+++ b/src/model/cloud-runner/cloud-runner.ts
@@ -87,14 +87,12 @@ class CloudRunner {
       throw new Error(`baseImage is undefined`);
     }
     await CloudRunner.setup(buildParameters);
-    if (!CloudRunner.buildParameters.isCliMode) core.startGroup('Setup shared cloud runner resources');
     await CloudRunner.Provider.setupWorkflow(
       CloudRunner.buildParameters.buildGuid,
       CloudRunner.buildParameters,
       CloudRunner.buildParameters.branch,
       CloudRunner.defaultSecrets,
     );
-    if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
     try {
       if (buildParameters.maxRetainedWorkspaces > 0) {
         CloudRunner.lockedWorkspace = SharedWorkspaceLocking.NewWorkspaceName();
@@ -125,14 +123,12 @@ class CloudRunner {
           CloudRunner.defaultSecrets,
         ),
       );
-      if (!CloudRunner.buildParameters.isCliMode) core.startGroup('Cleanup shared cloud runner resources');
       await CloudRunner.Provider.cleanupWorkflow(
         CloudRunner.buildParameters.buildGuid,
         CloudRunner.buildParameters,
         CloudRunner.buildParameters.branch,
         CloudRunner.defaultSecrets,
       );
-      CloudRunnerLogger.log(`Cleanup complete`);
       if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
       if ((buildParameters.asyncWorkflow && this.isCloudRunnerEnvironment) || !buildParameters.asyncWorkflow) {
         await GitHub.updateGitHubCheck(CloudRunner.buildParameters.buildGuid, `success`, `success`, `completed`);
diff --git a/src/model/cloud-runner/services/hooks/container-hook-service.ts b/src/model/cloud-runner/services/hooks/container-hook-service.ts
index 343429c8..c93fe7ee 100644
--- a/src/model/cloud-runner/services/hooks/container-hook-service.ts
+++ b/src/model/cloud-runner/services/hooks/container-hook-service.ts
@@ -1,6 +1,5 @@
 import YAML from 'yaml';
 import CloudRunner from '../../cloud-runner';
-import * as core from '@actions/core';
 import { CustomWorkflow } from '../../workflows/custom-workflow';
 import { RemoteClientLogger } from '../../remote-client/remote-client-logger';
 import path from 'node:path';
@@ -237,13 +236,11 @@ export class ContainerHookService {
     ];
 
     if (steps.length > 0) {
-      if (!CloudRunner.buildParameters.isCliMode) core.startGroup('post build steps');
       output += await CustomWorkflow.runContainerJob(
         steps,
         cloudRunnerStepState.environment,
         cloudRunnerStepState.secrets,
       );
-      if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
     }
 
     return output;
@@ -256,13 +253,11 @@ export class ContainerHookService {
     ];
 
     if (steps.length > 0) {
-      if (!CloudRunner.buildParameters.isCliMode) core.startGroup('pre build steps');
       output += await CustomWorkflow.runContainerJob(
         steps,
         cloudRunnerStepState.environment,
         cloudRunnerStepState.secrets,
       );
-      if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
     }
 
     return output;
diff --git a/src/model/cloud-runner/workflows/build-automation-workflow.ts b/src/model/cloud-runner/workflows/build-automation-workflow.ts
index c812e123..08a58b89 100644
--- a/src/model/cloud-runner/workflows/build-automation-workflow.ts
+++ b/src/model/cloud-runner/workflows/build-automation-workflow.ts
@@ -2,7 +2,6 @@ import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 import { CloudRunnerFolders } from '../options/cloud-runner-folders';
 import { CloudRunnerStepParameters } from '../options/cloud-runner-step-parameters';
 import { WorkflowInterface } from './workflow-interface';
-import * as core from '@actions/core';
 import { CommandHookService } from '../services/hooks/command-hook-service';
 import path from 'node:path';
 import CloudRunner from '../cloud-runner';
@@ -21,8 +20,6 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
 
     output += await ContainerHookService.RunPreBuildSteps(cloudRunnerStepState);
     CloudRunnerLogger.logWithTime('Configurable pre build step(s) time');
-
-    if (!CloudRunner.buildParameters.isCliMode) core.startGroup('build');
     CloudRunnerLogger.log(baseImage);
     CloudRunnerLogger.logLine(` `);
     CloudRunnerLogger.logLine('Starting build automation job');
@@ -36,7 +33,6 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
       cloudRunnerStepState.environment,
       cloudRunnerStepState.secrets,
     );
-    if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
     CloudRunnerLogger.logWithTime('Build time');
 
     output += await ContainerHookService.RunPostBuildSteps(cloudRunnerStepState);