diff --git a/app/scripts/modules/kubernetes/src/v2/kubernetes.v2.module.ts b/app/scripts/modules/kubernetes/src/v2/kubernetes.v2.module.ts
index 874733fa148..293c83b6e1d 100644
--- a/app/scripts/modules/kubernetes/src/v2/kubernetes.v2.module.ts
+++ b/app/scripts/modules/kubernetes/src/v2/kubernetes.v2.module.ts
@@ -8,7 +8,6 @@ import { KUBERNETES_MANIFEST_DELETE_CTRL } from './manifest/delete/delete.contro
 import { KUBERNETES_MANIFEST_SCALE_CTRL } from './manifest/scale/scale.controller';
 import { KUBERNETES_V2_INSTANCE_DETAILS_CTRL } from './instance/details/details.controller';
 import { KUBERNETES_DELETE_MANIFEST_STAGE } from './pipelines/stages/deleteManifest/deleteManifestStage';
-import { KUBERNETES_PATCH_MANIFEST_STAGE } from './pipelines/stages/patchManifest/patchManifestStage';
 import { KUBERNETES_SCALE_MANIFEST_STAGE } from './pipelines/stages/scaleManifest/scaleManifestStage';
 import { KUBERNETES_UNDO_ROLLOUT_MANIFEST_STAGE } from './pipelines/stages/undoRolloutManifest/undoRolloutManifestStage';
 import { KUBERNETES_FIND_ARTIFACTS_FROM_RESOURCE_STAGE } from './pipelines/stages/findArtifactsFromResource/findArtifactsFromResourceStage';
@@ -43,6 +42,7 @@ import { KUBERNETES_V2_RUN_JOB_STAGE } from 'kubernetes/v2/pipelines/stages/runJ
 
 // React stages
 import './pipelines/stages/deployManifest/deployManifestStage';
+import './pipelines/stages/patchManifest/patchManifestStage';
 
 import './pipelines/validation/manifestSelector.validator';
 
@@ -76,7 +76,6 @@ module(KUBERNETES_V2_MODULE, [
   KUBERNETES_V2_SECURITY_GROUP_TRANSFORMER,
   require('../securityGroup/reader').name,
   KUBERNETES_DELETE_MANIFEST_STAGE,
-  KUBERNETES_PATCH_MANIFEST_STAGE,
   KUBERNETES_SCALE_MANIFEST_STAGE,
   KUBERNETES_UNDO_ROLLOUT_MANIFEST_STAGE,
   KUBERNETES_FIND_ARTIFACTS_FROM_RESOURCE_STAGE,
diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/DeployManifestStageForm.tsx b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/DeployManifestStageForm.tsx
index 85820bc4277..e9f7f8f5629 100644
--- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/DeployManifestStageForm.tsx
+++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/DeployManifestStageForm.tsx
@@ -46,6 +46,7 @@ export class DeployManifestStageForm extends React.Component<
     ArtifactTypePatterns.KUBERNETES,
     ArtifactTypePatterns.FRONT50_PIPELINE_TEMPLATE,
     ArtifactTypePatterns.EMBEDDED_BASE64,
+    ArtifactTypePatterns.MAVEN_FILE,
   ];
 
   public constructor(props: IDeployManifestStageConfigFormProps & IFormikStageConfigInjectedProps) {
diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/PatchManifestOptionsForm.tsx b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/PatchManifestOptionsForm.tsx
new file mode 100644
index 00000000000..7efc79a7311
--- /dev/null
+++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/PatchManifestOptionsForm.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react';
+import { CheckboxInput, StageConfigField } from '@spinnaker/core';
+import Select, { Option } from 'react-select';
+
+export interface IPatchManifestOptionsFormProps {
+  record: boolean;
+  onRecordChange: (record: boolean) => void;
+  strategy: string;
+  onStrategyChange: (strategy: string) => void;
+}
+
+export const PatchManifestOptionsForm: React.FunctionComponent<IPatchManifestOptionsFormProps> = (
+  props: IPatchManifestOptionsFormProps,
+) => {
+  return (
+    <div className="form-horizontal">
+      <StageConfigField label="Record Patch Annotation" helpKey="kubernetes.manifest.patch.record">
+        <CheckboxInput
+          checked={props.record}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => props.onRecordChange(e.target.checked)}
+        />
+      </StageConfigField>
+      <StageConfigField label="Merge Strategy" helpKey="kubernetes.manifest.patch.mergeStrategy" fieldColumns={3}>
+        <Select
+          clearable={false}
+          value={props.strategy}
+          options={['strategic', 'json', 'merge'].map(k => ({ value: k, label: k }))}
+          onChange={(e: Option<string>) => props.onStrategyChange(e.value)}
+        />
+      </StageConfigField>
+    </div>
+  );
+};
diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/PatchManifestStageConfig.tsx b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/PatchManifestStageConfig.tsx
new file mode 100644
index 00000000000..85e65cdde30
--- /dev/null
+++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/PatchManifestStageConfig.tsx
@@ -0,0 +1,58 @@
+import * as React from 'react';
+import { defaults } from 'lodash';
+import { Observable, Subject } from 'rxjs';
+
+import { FormikStageConfig, IStage, IStageConfigProps } from '@spinnaker/core';
+import { KubernetesManifestCommandBuilder } from 'kubernetes/v2/manifest/manifestCommandBuilder.service';
+import { PatchManifestStageForm } from './PatchManifestStageForm';
+
+export class PatchManifestStageConfig extends React.Component<IStageConfigProps> {
+  private readonly stage: IStage;
+  private destroy$ = new Subject();
+
+  public constructor(props: IStageConfigProps) {
+    super(props);
+
+    // Intentionally initializing the stage config only once in the constructor
+    // The stage config is then completely owned within FormikStageConfig's Formik state
+    this.stage = props.stage;
+  }
+
+  public componentDidMount(): void {
+    Observable.fromPromise(
+      KubernetesManifestCommandBuilder.buildNewManifestCommand(
+        this.props.application,
+        this.stage.patchBody,
+        this.stage.moniker,
+      ),
+    )
+      .takeUntil(this.destroy$)
+      .subscribe(builtCommand => {
+        if (this.stage.isNew) {
+          defaults(this.stage, {
+            account: builtCommand.command.account,
+            manifestArtifactAccount: 'embedded-artifact',
+            patchBody: builtCommand.command.manifest,
+            source: 'text',
+            options: {
+              record: true,
+              strategy: 'strategic',
+            },
+            location: '',
+            cloudProvider: 'kubernetes',
+          });
+        }
+      });
+  }
+
+  public render() {
+    return (
+      <FormikStageConfig
+        {...this.props}
+        stage={this.stage}
+        onChange={this.props.updateStage}
+        render={props => <PatchManifestStageForm {...props} updatePipeline={this.props.updatePipeline} />}
+      />
+    );
+  }
+}
diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/PatchManifestStageForm.tsx b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/PatchManifestStageForm.tsx
new file mode 100644
index 00000000000..80392456f68
--- /dev/null
+++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/PatchManifestStageForm.tsx
@@ -0,0 +1,166 @@
+import * as React from 'react';
+import { Option } from 'react-select';
+import { capitalize, get, isEmpty, map } from 'lodash';
+
+import {
+  ArtifactTypePatterns,
+  IArtifact,
+  IExpectedArtifact,
+  IFormikStageConfigInjectedProps,
+  IPipeline,
+  RadioButtonInput,
+  StageArtifactSelectorDelegate,
+  StageConfigField,
+  yamlDocumentsToString,
+  YamlEditor,
+} from '@spinnaker/core';
+
+import { ManifestBindArtifactsSelectorDelegate } from 'kubernetes/v2/pipelines/stages/deployManifest/ManifestBindArtifactsSelectorDelegate';
+import { IManifestBindArtifact } from 'kubernetes/v2/pipelines/stages/deployManifest/ManifestBindArtifactsSelector';
+import { ManifestSelector } from 'kubernetes/v2/manifest/selector/ManifestSelector';
+import { SelectorMode } from 'kubernetes/v2/manifest/selector/IManifestSelector';
+import { PatchManifestOptionsForm } from './PatchManifestOptionsForm';
+
+interface IPatchManifestStageConfigFormProps {
+  updatePipeline: (pipeline: IPipeline) => void;
+}
+
+interface IPatchManifestStageConfigFormState {
+  rawManifest: string;
+}
+
+export class PatchManifestStageForm extends React.Component<
+  IPatchManifestStageConfigFormProps & IFormikStageConfigInjectedProps,
+  IPatchManifestStageConfigFormState
+> {
+  public readonly textSource = 'text';
+  public readonly artifactSource = 'artifact';
+  private readonly excludedManifestArtifactTypes = [
+    ArtifactTypePatterns.DOCKER_IMAGE,
+    ArtifactTypePatterns.KUBERNETES,
+    ArtifactTypePatterns.FRONT50_PIPELINE_TEMPLATE,
+    ArtifactTypePatterns.EMBEDDED_BASE64,
+    ArtifactTypePatterns.MAVEN_FILE,
+  ];
+
+  public constructor(props: IPatchManifestStageConfigFormProps & IFormikStageConfigInjectedProps) {
+    super(props);
+    const patchBody: string = get(props.formik.values, 'patchBody');
+    const isTextManifest: boolean = get(props.formik.values, 'source') === this.textSource;
+    this.state = {
+      rawManifest: !isEmpty(patchBody) && isTextManifest ? yamlDocumentsToString([patchBody]) : '',
+    };
+  }
+
+  private onManifestArtifactSelected = (expectedArtifactId: string): void => {
+    this.props.formik.setFieldValue('manifestArtifactId', expectedArtifactId);
+    this.props.formik.setFieldValue('manifestArtifact', null);
+  };
+
+  private onManifestArtifactEdited = (artifact: IArtifact) => {
+    this.props.formik.setFieldValue('manifestArtifactId', null);
+    this.props.formik.setFieldValue('manifestArtifact', artifact);
+  };
+
+  private onManifestArtifactAccountSelected = (accountName: string): void => {
+    this.props.formik.setFieldValue('manifestArtifactAccount', accountName);
+  };
+
+  private getRequiredArtifacts = (): IManifestBindArtifact[] => {
+    const { requiredArtifactIds, requiredArtifacts } = this.props.formik.values;
+    return (requiredArtifactIds || [])
+      .map((id: string) => ({ expectedArtifactId: id }))
+      .concat(requiredArtifacts || []);
+  };
+
+  private onRequiredArtifactsChanged = (bindings: IManifestBindArtifact[]): void => {
+    this.props.formik.setFieldValue(
+      'requiredArtifactIds',
+      bindings.filter(b => b.expectedArtifactId).map(b => b.expectedArtifactId),
+    );
+    this.props.formik.setFieldValue('requiredArtifacts', bindings.filter(b => b.artifact));
+  };
+
+  private handleRawManifestChange = (rawManifest: string, manifests: any): void => {
+    this.setState({
+      rawManifest,
+    });
+    this.props.formik.setFieldValue('patchBody', manifests[0]);
+  };
+
+  private onManifestSelectorChange = (): void => {};
+
+  private getSourceOptions = (): Array<Option<string>> => {
+    return map([this.textSource, this.artifactSource], option => ({
+      label: capitalize(option),
+      value: option,
+    }));
+  };
+
+  public render() {
+    const stage = this.props.formik.values;
+    return (
+      <div className="container-fluid form-horizontal">
+        <h4>Resource to Patch</h4>
+        <ManifestSelector
+          application={this.props.application}
+          modes={[SelectorMode.Static, SelectorMode.Dynamic]}
+          onChange={this.onManifestSelectorChange}
+          selector={stage as any}
+        />
+        <hr />
+        <h4>Patch Content</h4>
+        <StageConfigField label="Manifest Source" helpKey="kubernetes.manifest.source">
+          <RadioButtonInput
+            options={this.getSourceOptions()}
+            onChange={(e: any) => this.props.formik.setFieldValue('source', e.target.value)}
+            value={stage.source || 'text'}
+            inline={true}
+          />
+        </StageConfigField>
+        {stage.source === this.textSource && (
+          <StageConfigField label="Manifest">
+            <YamlEditor onChange={this.handleRawManifestChange} value={this.state.rawManifest} />
+          </StageConfigField>
+        )}
+        {stage.source === this.artifactSource && (
+          <>
+            <StageArtifactSelectorDelegate
+              artifact={stage.manifestArtifact}
+              excludedArtifactTypePatterns={this.excludedManifestArtifactTypes}
+              expectedArtifactId={stage.manifestArtifactId}
+              helpKey="kubernetes.manifest.expectedArtifact"
+              label="Manifest Artifact"
+              onArtifactEdited={this.onManifestArtifactEdited}
+              onExpectedArtifactSelected={(artifact: IExpectedArtifact) => this.onManifestArtifactSelected(artifact.id)}
+              pipeline={this.props.pipeline}
+              selectedArtifactAccount={stage.manifestArtifactAccount}
+              selectedArtifactId={stage.manifestArtifactId}
+              setArtifactAccount={this.onManifestArtifactAccountSelected}
+              setArtifactId={this.onManifestArtifactSelected}
+              stage={stage}
+              updatePipeline={this.props.updatePipeline}
+            />
+          </>
+        )}
+        <StageConfigField label="Required Artifacts to Bind" helpKey="kubernetes.manifest.requiredArtifactsToBind">
+          <ManifestBindArtifactsSelectorDelegate
+            bindings={this.getRequiredArtifacts()}
+            onChangeBindings={this.onRequiredArtifactsChanged}
+            pipeline={this.props.pipeline}
+            stage={stage}
+          />
+        </StageConfigField>
+
+        <hr />
+        <h4>Patch Options</h4>
+        <PatchManifestOptionsForm
+          strategy={!!stage.options && stage.options.strategy}
+          onStrategyChange={(strategy: string) => this.props.formik.setFieldValue('options.strategy', strategy)}
+          record={!!stage.options && stage.options.record}
+          onRecordChange={(record: boolean) => this.props.formik.setFieldValue('options.record', record)}
+        />
+      </div>
+    );
+  }
+}
diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.controller.ts b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.controller.ts
deleted file mode 100644
index 17803a2a7a0..00000000000
--- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.controller.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { IController, IScope } from 'angular';
-import { get, defaults } from 'lodash';
-import { dump } from 'js-yaml';
-import { ExpectedArtifactSelectorViewController, NgGenericArtifactDelegate } from '@spinnaker/core';
-import { IPatchOptions, MergeStrategy } from './patchOptionsForm.component';
-import {
-  IKubernetesManifestCommandMetadata,
-  KubernetesManifestCommandBuilder,
-} from 'kubernetes/v2/manifest/manifestCommandBuilder.service';
-import { JSON_EDITOR_TAB_SIZE } from 'kubernetes/v2/manifest/editor/json/JsonEditor';
-
-export enum EditorMode {
-  json = 'json',
-  yaml = 'yaml',
-}
-
-export const mergeStrategyToEditorMode: { [m in MergeStrategy]: EditorMode } = {
-  [MergeStrategy.strategic]: EditorMode.yaml,
-  [MergeStrategy.json]: EditorMode.json,
-  [MergeStrategy.merge]: EditorMode.json,
-};
-
-export class KubernetesV2PatchManifestConfigCtrl implements IController {
-  public state = {
-    loaded: false,
-  };
-
-  public metadata: IKubernetesManifestCommandMetadata;
-  public textSource = 'text';
-  public artifactSource = 'artifact';
-  public sources = [this.textSource, this.artifactSource];
-  public rawPatchBody: string;
-
-  private manifestArtifactDelegate: NgGenericArtifactDelegate;
-  private manifestArtifactController: ExpectedArtifactSelectorViewController;
-
-  public static $inject = ['$scope'];
-  constructor(private $scope: IScope) {
-    const defaultOptions: IPatchOptions = {
-      mergeStrategy: MergeStrategy.strategic,
-      record: true,
-    };
-
-    if (this.$scope.stage.isNew) {
-      this.$scope.stage.options = defaultOptions;
-    }
-
-    if (!this.$scope.stage.app) {
-      this.$scope.stage.app = this.$scope.application.name;
-    }
-
-    this.setRawPatchBody(this.getMergeStrategy());
-
-    this.manifestArtifactDelegate = new NgGenericArtifactDelegate($scope, 'manifest');
-    this.manifestArtifactController = new ExpectedArtifactSelectorViewController(this.manifestArtifactDelegate);
-
-    KubernetesManifestCommandBuilder.buildNewManifestCommand(
-      this.$scope.application,
-      this.$scope.stage.patchBody,
-      this.$scope.stage.moniker,
-    ).then(builtCommand => {
-      if (this.$scope.stage.isNew) {
-        defaults(this.$scope.stage, {
-          account: builtCommand.command.account,
-          manifestArtifactId: builtCommand.command.manifestArtifactId,
-          manifestArtifactAccount: builtCommand.command.manifestArtifactAccount,
-          patchBody: builtCommand.command.manifests || builtCommand.command.manifest,
-          source: this.textSource,
-          location: '',
-          cloudProvider: 'kubernetes',
-        });
-      }
-      this.metadata = builtCommand.metadata;
-      this.state.loaded = true;
-      this.manifestArtifactDelegate.setAccounts(get(this, ['metadata', 'backingData', 'artifactAccounts']));
-      this.manifestArtifactController.updateAccounts(this.manifestArtifactDelegate.getSelectedExpectedArtifact());
-    });
-  }
-
-  public handlePatchBodyChange = (rawPatchBody: string, patchBody: any): void => {
-    this.rawPatchBody = rawPatchBody;
-    if (this.getEditorMode() === EditorMode.yaml) {
-      // YamlEditor patchBody is list of YAML documents, take first as patch
-      this.$scope.stage.patchBody = Array.isArray(patchBody) && patchBody.length > 0 ? patchBody[0] : null;
-    } else {
-      this.$scope.stage.patchBody = patchBody;
-    }
-    // Called from a React component.
-    this.$scope.$applyAsync();
-  };
-
-  public canShowAccountSelect() {
-    return (
-      !this.$scope.showCreateArtifactForm &&
-      (this.manifestArtifactController.accountsForArtifact.length > 1 &&
-        this.manifestArtifactDelegate.getSelectedExpectedArtifact() != null)
-    );
-  }
-
-  public handleManifestSelectorChange = (): void => {
-    this.$scope.$applyAsync();
-  };
-
-  private getMergeStrategy = (): MergeStrategy => {
-    return this.$scope.stage.options.mergeStrategy;
-  };
-
-  public getEditorMode = (): EditorMode => {
-    return mergeStrategyToEditorMode[this.getMergeStrategy()];
-  };
-
-  private setRawPatchBody = (mergeStrategy: MergeStrategy): void => {
-    const editorMode = mergeStrategyToEditorMode[mergeStrategy];
-    const patchBody = this.$scope.stage.patchBody;
-    try {
-      if (editorMode === EditorMode.yaml) {
-        this.rawPatchBody = patchBody ? dump(patchBody) : null;
-      } else {
-        this.rawPatchBody = patchBody ? JSON.stringify(patchBody, null, JSON_EDITOR_TAB_SIZE) : null;
-      }
-    } catch (e) {
-      this.rawPatchBody = null;
-    }
-  };
-
-  public handleMergeStrategyChange = (): void => {
-    this.handlePatchBodyChange('', null);
-    this.$scope.$applyAsync();
-  };
-}
diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.html b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.html
deleted file mode 100644
index 5f4c6da529d..00000000000
--- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestConfig.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<div ng-if="ctrl.state.loaded" class="clearfix">
-  <div class="container-fluid form-horizontal">
-    <h4>Resource to Patch</h4>
-    <div class="horizontal-rule"></div>
-    <kubernetes-manifest-selector
-      application="ctrl.$scope.application"
-      modes='["static", "dynamic"]'
-      on-change="ctrl.handleManifestSelectorChange"
-      selector="ctrl.$scope.stage"
-    ></kubernetes-manifest-selector>
-
-    <h4>Patch Content</h4>
-    <hr />
-    <ng-form name="patchContentSource">
-      <stage-config-field label="Manifest Source" help-key="kubernetes.manifest.source">
-        <div class="radio">
-          <label class="sm-label-right">
-            <input type="radio" ng-model="ctrl.$scope.stage.source" value="{{ctrl.textSource}}" />
-            {{ ctrl.textSource | robotToHuman }}
-          </label>
-        </div>
-        <div class="radio">
-          <label class="sm-label-right">
-            <input type="radio" ng-model="ctrl.$scope.stage.source" value="{{ctrl.artifactSource}}" />
-            {{ ctrl.artifactSource | robotToHuman }}
-          </label>
-        </div>
-      </stage-config-field>
-    </ng-form>
-    <yaml-editor
-      ng-if="stage.source === ctrl.textSource && ctrl.getEditorMode() === 'yaml'"
-      on-change="ctrl.handlePatchBodyChange"
-      value="ctrl.rawPatchBody"
-    >
-    </yaml-editor>
-    <json-editor
-      ng-if="stage.source === ctrl.textSource && ctrl.getEditorMode() === 'json'"
-      on-change="ctrl.handlePatchBodyChange"
-      value="ctrl.rawPatchBody"
-    >
-    </json-editor>
-    <stage-config-field
-      label="Expected Artifact"
-      help-key="kubernetes.manifest.expectedArtifact"
-      field-columns="8"
-      ng-if="ctrl.$scope.stage.source === ctrl.artifactSource"
-    >
-      <expected-artifact-selector-react
-        expected-artifacts="ctrl.$scope.expectedArtifacts"
-        selected="ctrl.manifestArtifactDelegate.getSelectedExpectedArtifact()"
-        on-change="ctrl.manifestArtifactController.onArtifactChange"
-        on-request-create="ctrl.manifestArtifactController.onRequestCreate"
-        excluded-artifact-types="ctrl.manifestArtifactDelegate.getExcludedArtifactTypes()"
-        requesting-new="ctrl.$scope.showCreateArtifactForm"
-      >
-      </expected-artifact-selector-react>
-    </stage-config-field>
-    <stage-config-field label="Artifact Account" field-columns="8" ng-if="ctrl.canShowAccountSelect()">
-      <artifact-account-selector-react
-        accounts="ctrl.manifestArtifactController.accountsForArtifact"
-        selected="ctrl.manifestArtifactDelegate.getSelectedAccount()"
-        on-change="ctrl.manifestArtifactController.onAccountChange"
-      >
-      </artifact-account-selector-react>
-    </stage-config-field>
-    <expected-artifact-editor-react
-      ng-if="ctrl.$scope.showCreateArtifactForm"
-      kinds="ctrl.manifestArtifactDelegate.getSupportedArtifactKinds()"
-      sources="ctrl.manifestArtifactDelegate.getExpectedArtifactSources()"
-      accounts="ctrl.manifestArtifactDelegate.getExpectedArtifactAccounts()"
-      on-save="ctrl.manifestArtifactController.onArtifactCreated"
-    >
-    </expected-artifact-editor-react>
-    <hr />
-    <expected-artifact-multi-selector
-      command="ctrl.$scope.stage"
-      ids-field="requiredArtifactIds"
-      artifact-label="Req. Artifacts To Bind"
-      expected-artifacts="ctrl.$scope.expectedArtifacts"
-      help-field-key="kubernetes.manifest.requiredArtifactsToBind"
-      show-icons="true"
-    >
-    </expected-artifact-multi-selector>
-
-    <h4>Patch Options</h4>
-    <div class="horizontal-rule"></div>
-    <kubernetes-patch-manifest-options-form
-      options="ctrl.$scope.stage.options"
-      on-change="ctrl.handleMergeStrategyChange"
-    >
-    </kubernetes-patch-manifest-options-form>
-  </div>
-</div>
diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestStage.ts b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestStage.ts
index 6bb71ecad0c..c1ebab9ea37 100644
--- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestStage.ts
+++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchManifestStage.ts
@@ -1,5 +1,3 @@
-import { module } from 'angular';
-
 import {
   ArtifactReferenceService,
   ExecutionArtifactTab,
@@ -9,40 +7,27 @@ import {
   SETTINGS,
 } from '@spinnaker/core';
 
-import { KubernetesV2PatchManifestConfigCtrl } from '../patchManifest/patchManifestConfig.controller';
-import { KUBERNETES_PATCH_MANIFEST_OPTIONS_FORM } from './patchOptionsForm.component';
-import { KUBERNETES_MANIFEST_SELECTOR } from 'kubernetes/v2/manifest/selector/selector.component';
 import { DeployStatus } from '../deployManifest/manifestStatus/DeployStatus';
 import { manifestSelectorValidators } from '../validators/manifestSelectorValidators';
-
-export const KUBERNETES_PATCH_MANIFEST_STAGE = 'spinnaker.kubernetes.v2.pipeline.stage.patchManifestStage';
+import { PatchManifestStageConfig } from './PatchManifestStageConfig';
 
 export class PatchStatus extends DeployStatus {
   public static title = 'PatchStatus';
 }
 
 const STAGE_NAME = 'Patch (Manifest)';
-module(KUBERNETES_PATCH_MANIFEST_STAGE, [KUBERNETES_PATCH_MANIFEST_OPTIONS_FORM, KUBERNETES_MANIFEST_SELECTOR])
-  .config(() => {
-    if (SETTINGS.feature.versionedProviders) {
-      Registry.pipeline.registerStage({
-        label: STAGE_NAME,
-        description: 'Patch a Kubernetes object in place.',
-        key: 'patchManifest',
-        cloudProvider: 'kubernetes',
-        templateUrl: require('./patchManifestConfig.html'),
-        controller: 'KubernetesV2PatchManifestConfigCtrl',
-        controllerAs: 'ctrl',
-        executionDetailsSections: [PatchStatus, ExecutionDetailsTasks, ExecutionArtifactTab],
-        producesArtifacts: true,
-        defaultTimeoutMs: 30 * 60 * 1000, // 30 minutes
-        validators: manifestSelectorValidators(STAGE_NAME),
-        artifactExtractor: ExpectedArtifactService.accumulateArtifacts(['manifestArtifactId', 'requiredArtifactIds']),
-        artifactRemover: ArtifactReferenceService.removeArtifactFromFields([
-          'manifestArtifactId',
-          'requiredArtifactIds',
-        ]),
-      });
-    }
-  })
-  .controller('KubernetesV2PatchManifestConfigCtrl', KubernetesV2PatchManifestConfigCtrl);
+if (SETTINGS.feature.versionedProviders) {
+  Registry.pipeline.registerStage({
+    label: STAGE_NAME,
+    description: 'Patch a Kubernetes object in place.',
+    key: 'patchManifest',
+    cloudProvider: 'kubernetes',
+    component: PatchManifestStageConfig,
+    executionDetailsSections: [PatchStatus, ExecutionDetailsTasks, ExecutionArtifactTab],
+    producesArtifacts: true,
+    defaultTimeoutMs: 30 * 60 * 1000, // 30 minutes
+    validators: manifestSelectorValidators(STAGE_NAME),
+    artifactExtractor: ExpectedArtifactService.accumulateArtifacts(['manifestArtifactId', 'requiredArtifactIds']),
+    artifactRemover: ArtifactReferenceService.removeArtifactFromFields(['manifestArtifactId', 'requiredArtifactIds']),
+  });
+}
diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchOptionsForm.component.ts b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchOptionsForm.component.ts
deleted file mode 100644
index d7a7557d864..00000000000
--- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/patchManifest/patchOptionsForm.component.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { IComponentOptions, IController, module } from 'angular';
-
-export interface IPatchOptions {
-  mergeStrategy: MergeStrategy;
-  record: boolean;
-}
-
-export enum MergeStrategy {
-  strategic = 'strategic',
-  json = 'json',
-  merge = 'merge',
-}
-
-class KubernetesPatchManifestOptionsFormCtrl implements IController {
-  public options: IPatchOptions;
-  public mergeStrategies = MergeStrategy;
-}
-
-const kubernetesPatchManifestOptionsFormComponent: IComponentOptions = {
-  bindings: { options: '=', onChange: '<' },
-  controller: KubernetesPatchManifestOptionsFormCtrl,
-  controllerAs: 'ctrl',
-  template: `
-    <div class="form-horizontal">
-      <div class="form-group form-inline">
-        <div class="col-md-3 sm-label-right">
-          Record Patch Annotation
-          <help-field key="kubernetes.manifest.patch.record"></help-field>
-        </div>
-        <div class="col-md-3">
-          <div class="input-group">
-            <input type="checkbox" ng-model="ctrl.options.record"/>
-          </div>
-        </div>
-      </div>
-
-      <div class="form-group form-inline">
-        <div class="col-md-3 sm-label-right">
-          Merge Strategy
-          <help-field key="kubernetes.manifest.patch.mergeStrategy"></help-field>
-        </div>
-        <div class="col-md-4">
-          <div class="input-group">
-            <select class="form-control input-sm"
-                    ng-model="ctrl.options.mergeStrategy"
-                    ng-change="ctrl.onChange()">
-              <option ng-repeat="strategy in ctrl.mergeStrategies" value="{{strategy}}"
-                      ng-selected="ctrl.options.mergeStrategy === strategy">
-                {{strategy}}
-              </option>
-            </select>
-          </div>
-        </div>
-      </div>
-    </div>
-  `,
-};
-
-export const KUBERNETES_PATCH_MANIFEST_OPTIONS_FORM = 'spinnaker.kubernetes.v2.manifest.patch.options.component';
-module(KUBERNETES_PATCH_MANIFEST_OPTIONS_FORM, []).component(
-  'kubernetesPatchManifestOptionsForm',
-  kubernetesPatchManifestOptionsFormComponent,
-);