diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml
index a2716bf3ea58..f8f12b83b822 100644
--- a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml
+++ b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml
@@ -832,9 +832,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
 
-  # TODO(gfrasca): remove?  Unused in v3.4
   # Choice of an executor is deprecated in favor of emissary executor
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent
     resources:
diff --git a/manifests/gcp_marketplace/test/snapshot-base.yaml b/manifests/gcp_marketplace/test/snapshot-base.yaml
index ee121754d382..8ae7fe98b725 100644
--- a/manifests/gcp_marketplace/test/snapshot-base.yaml
+++ b/manifests/gcp_marketplace/test/snapshot-base.yaml
@@ -151,9 +151,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
 
-  # TODO(gfrasca): remove?  Unused in v3.4
   # Choice of an executor is deprecated in favor of emissary executor
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent
     resources:
diff --git a/manifests/gcp_marketplace/test/snapshot-emissary.yaml b/manifests/gcp_marketplace/test/snapshot-emissary.yaml
index ee121754d382..8ae7fe98b725 100644
--- a/manifests/gcp_marketplace/test/snapshot-emissary.yaml
+++ b/manifests/gcp_marketplace/test/snapshot-emissary.yaml
@@ -151,9 +151,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
 
-  # TODO(gfrasca): remove?  Unused in v3.4
   # Choice of an executor is deprecated in favor of emissary executor
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent
     resources:
diff --git a/manifests/gcp_marketplace/test/snapshot-managed-storage-with-db-prefix.yaml b/manifests/gcp_marketplace/test/snapshot-managed-storage-with-db-prefix.yaml
index 85bf700abece..71854452186e 100644
--- a/manifests/gcp_marketplace/test/snapshot-managed-storage-with-db-prefix.yaml
+++ b/manifests/gcp_marketplace/test/snapshot-managed-storage-with-db-prefix.yaml
@@ -167,9 +167,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
 
-  # TODO(gfrasca): remove?  Unused in v3.4
   # Choice of an executor is deprecated in favor of emissary executor
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent
     resources:
diff --git a/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml b/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml
index 8f8586a763eb..01a2aa64accb 100644
--- a/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml
+++ b/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml
@@ -167,9 +167,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
   # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
 
-  # TODO(gfrasca): remove?  Unused in v3.4
   # Choice of an executor is deprecated in favor of emissary executor
-  containerRuntimeExecutor: emissary
   executor: |
     imagePullPolicy: IfNotPresent
     resources:
diff --git a/manifests/kustomize/env/platform-agnostic-emissary/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-emissary/kustomization.yaml
index b0f866295b97..fbf9fa54c757 100644
--- a/manifests/kustomize/env/platform-agnostic-emissary/kustomization.yaml
+++ b/manifests/kustomize/env/platform-agnostic-emissary/kustomization.yaml
@@ -1,7 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
-- ../platform-agnostic
-
-patchesStrategicMerge:
-- workflow-controller-configmap-patch.yaml
+- ../platform-agnostic
\ No newline at end of file
diff --git a/manifests/kustomize/env/platform-agnostic-emissary/workflow-controller-configmap-patch.yaml b/manifests/kustomize/env/platform-agnostic-emissary/workflow-controller-configmap-patch.yaml
deleted file mode 100644
index 826e0249d02d..000000000000
--- a/manifests/kustomize/env/platform-agnostic-emissary/workflow-controller-configmap-patch.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: workflow-controller-configmap
-data:
-  # References:
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/config/config.go
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
-
-  # TODO(gfrasca): remove?  Unused in v3.4
-  # Emissary Executor: https://argoproj.github.io/argo-workflows/workflow-executors/#emissary-emissary
-  containerRuntimeExecutor: emissary
diff --git a/manifests/kustomize/env/platform-agnostic-multi-user-emissary/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-multi-user-emissary/kustomization.yaml
index 42dda7adc03a..2b2f8e979699 100644
--- a/manifests/kustomize/env/platform-agnostic-multi-user-emissary/kustomization.yaml
+++ b/manifests/kustomize/env/platform-agnostic-multi-user-emissary/kustomization.yaml
@@ -2,6 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
 - ../platform-agnostic-multi-user
-
-patchesStrategicMerge:
-- workflow-controller-configmap-patch.yaml
diff --git a/manifests/kustomize/env/platform-agnostic-multi-user-emissary/workflow-controller-configmap-patch.yaml b/manifests/kustomize/env/platform-agnostic-multi-user-emissary/workflow-controller-configmap-patch.yaml
deleted file mode 100644
index 826e0249d02d..000000000000
--- a/manifests/kustomize/env/platform-agnostic-multi-user-emissary/workflow-controller-configmap-patch.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: workflow-controller-configmap
-data:
-  # References:
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/config/config.go
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
-
-  # TODO(gfrasca): remove?  Unused in v3.4
-  # Emissary Executor: https://argoproj.github.io/argo-workflows/workflow-executors/#emissary-emissary
-  containerRuntimeExecutor: emissary
diff --git a/manifests/kustomize/env/platform-agnostic-multi-user-pns/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-multi-user-pns/kustomization.yaml
deleted file mode 100644
index 42dda7adc03a..000000000000
--- a/manifests/kustomize/env/platform-agnostic-multi-user-pns/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-bases:
-- ../platform-agnostic-multi-user
-
-patchesStrategicMerge:
-- workflow-controller-configmap-patch.yaml
diff --git a/manifests/kustomize/env/platform-agnostic-multi-user-pns/workflow-controller-configmap-patch.yaml b/manifests/kustomize/env/platform-agnostic-multi-user-pns/workflow-controller-configmap-patch.yaml
deleted file mode 100644
index 9666731c63d7..000000000000
--- a/manifests/kustomize/env/platform-agnostic-multi-user-pns/workflow-controller-configmap-patch.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: workflow-controller-configmap
-data:
-  # References:
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/config/config.go
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
-
-  # TODO(gfrasca): remove?  Unused in v3.4
-  # pns executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654.
-  # However, it is flaky for containers that run really fast, see https://github.com/kubeflow/pipelines/issues/5285.
-  containerRuntimeExecutor: pns
diff --git a/manifests/kustomize/env/platform-agnostic-pns/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-pns/kustomization.yaml
deleted file mode 100644
index b0f866295b97..000000000000
--- a/manifests/kustomize/env/platform-agnostic-pns/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-bases:
-- ../platform-agnostic
-
-patchesStrategicMerge:
-- workflow-controller-configmap-patch.yaml
diff --git a/manifests/kustomize/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml b/manifests/kustomize/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml
deleted file mode 100644
index 9666731c63d7..000000000000
--- a/manifests/kustomize/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: workflow-controller-configmap
-data:
-  # References:
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/config/config.go
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.md
-  # * https://github.com/argoproj/argo-workflows/blob/v3.4.16/docs/workflow-controller-configmap.yaml
-
-  # TODO(gfrasca): remove?  Unused in v3.4
-  # pns executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654.
-  # However, it is flaky for containers that run really fast, see https://github.com/kubeflow/pipelines/issues/5285.
-  containerRuntimeExecutor: pns
diff --git a/manifests/kustomize/hack/test.sh b/manifests/kustomize/hack/test.sh
index 7e251fbf6147..6df4293c5854 100755
--- a/manifests/kustomize/hack/test.sh
+++ b/manifests/kustomize/hack/test.sh
@@ -34,7 +34,6 @@ kustomization_yamls=(
   "env/dev"
   "env/gcp"
   "env/platform-agnostic"
-  "env/platform-agnostic-pns"
   "env/platform-agnostic-emissary"
   "env/aws"
   "env/azure"
@@ -48,7 +47,6 @@ done
 kustomization_yamls_v3=(
   "base/installs/multi-user"
   "env/platform-agnostic-multi-user"
-  "env/platform-agnostic-multi-user-pns"
   "env/platform-agnostic-multi-user-emissary"
 )
 for path in "${kustomization_yamls_v3[@]}"