diff --git a/packages/kubernetes/src/pipelines/stages/deleteManifest/deleteManifestStage.ts b/packages/kubernetes/src/pipelines/stages/deleteManifest/deleteManifestStage.ts
index 68e3096a1ca..49e0346a8b7 100644
--- a/packages/kubernetes/src/pipelines/stages/deleteManifest/deleteManifestStage.ts
+++ b/packages/kubernetes/src/pipelines/stages/deleteManifest/deleteManifestStage.ts
@@ -15,7 +15,7 @@ Registry.pipeline.registerStage({
   cloudProvider: 'kubernetes',
   component: DeleteManifestStageConfig,
   executionDetailsSections: [manifestExecutionDetails(STAGE_KEY), ExecutionDetailsTasks],
-  accountExtractor: (stage: IStage): string[] => (stage.account ? [stage.account] : []),
+  accountExtractor: (stage: IStage): string[] => (stage.context.account ? [stage.context.account] : []),
   configAccountExtractor: (stage: any): string[] => (stage.account ? [stage.account] : []),
   validators: manifestSelectorValidators(STAGE_NAME),
 });
diff --git a/packages/kubernetes/src/pipelines/stages/deployManifest/deployManifestStage.ts b/packages/kubernetes/src/pipelines/stages/deployManifest/deployManifestStage.ts
index 09fa4731a69..7b54b5cbb5f 100644
--- a/packages/kubernetes/src/pipelines/stages/deployManifest/deployManifestStage.ts
+++ b/packages/kubernetes/src/pipelines/stages/deployManifest/deployManifestStage.ts
@@ -21,7 +21,7 @@ Registry.pipeline.registerStage({
   producesArtifacts: true,
   supportsCustomTimeout: true,
   validators: deployManifestValidators(),
-  accountExtractor: (stage: IStage): string[] => (stage.account ? [stage.account] : []),
+  accountExtractor: (stage: IStage): string[] => (stage.context.account ? [stage.context.account] : []),
   configAccountExtractor: (stage: any): string[] => (stage.account ? [stage.account] : []),
   artifactExtractor: ExpectedArtifactService.accumulateArtifacts(['manifestArtifactId', 'requiredArtifactIds']),
   artifactRemover: ArtifactReferenceService.removeArtifactFromFields(['manifestArtifactId', 'requiredArtifactIds']),
diff --git a/packages/kubernetes/src/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceStage.ts b/packages/kubernetes/src/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceStage.ts
index b51acf73dbb..be83dcf67a5 100644
--- a/packages/kubernetes/src/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceStage.ts
+++ b/packages/kubernetes/src/pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceStage.ts
@@ -1,3 +1,4 @@
+import type { IStage } from '@spinnaker/core';
 import { ExecutionArtifactTab, ExecutionDetailsTasks, Registry } from '@spinnaker/core';
 
 import { FindArtifactsFromResourceConfig } from './FindArtifactsFromResourceConfig';
@@ -15,4 +16,6 @@ Registry.pipeline.registerStage({
   executionDetailsSections: [ExecutionDetailsTasks, ExecutionArtifactTab],
   producesArtifacts: true,
   validators: manifestSelectorValidators(STAGE_NAME),
+  accountExtractor: (stage: IStage): string[] => (stage.context.account ? [stage.context.account] : []),
+  configAccountExtractor: (stage: any): string[] => (stage.account ? [stage.account] : []),
 });
diff --git a/packages/kubernetes/src/pipelines/stages/scaleManifest/scaleManifestStage.ts b/packages/kubernetes/src/pipelines/stages/scaleManifest/scaleManifestStage.ts
index a5a612e8950..bf39ce05eb4 100644
--- a/packages/kubernetes/src/pipelines/stages/scaleManifest/scaleManifestStage.ts
+++ b/packages/kubernetes/src/pipelines/stages/scaleManifest/scaleManifestStage.ts
@@ -1,3 +1,4 @@
+import type { IStage } from '@spinnaker/core';
 import { ExecutionDetailsTasks, Registry } from '@spinnaker/core';
 
 import { manifestExecutionDetails } from '../ManifestExecutionDetails';
@@ -14,6 +15,8 @@ Registry.pipeline.registerStage({
   cloudProvider: 'kubernetes',
   component: ScaleManifestStageConfig,
   executionDetailsSections: [manifestExecutionDetails(STAGE_KEY), ExecutionDetailsTasks],
+  accountExtractor: (stage: IStage): string[] => (stage.context.account ? [stage.context.account] : []),
+  configAccountExtractor: (stage: any): string[] => (stage.account ? [stage.account] : []),
   validators: [
     ...manifestSelectorValidators(STAGE_NAME),
     { type: 'requiredField', fieldName: 'replicas', fieldLabel: 'Replicas' },