diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml
index 4a74539a54e..799c339a584 100644
--- a/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml
+++ b/manifests/gcp_marketplace/chart/kubeflow-pipelines/values.yaml
@@ -18,7 +18,7 @@ images:
   cachedeployer: gcr.io/ml-pipeline/google/pipelines/cachedeployer:dummy
 
 executor:
-  emissary: false
+  emissary: true
 gcpDefaultConfigName: "gcp-default-config"
 managedstorage:
   enabled: false
diff --git a/manifests/gcp_marketplace/test/snapshot-base.yaml b/manifests/gcp_marketplace/test/snapshot-base.yaml
index d3de5c9186a..0811624aec1 100644
--- a/manifests/gcp_marketplace/test/snapshot-base.yaml
+++ b/manifests/gcp_marketplace/test/snapshot-base.yaml
@@ -12,7 +12,7 @@ metadata:
 data:
   appName: 'my-release'
   namespace: 'kubeflow'
-  emissaryExecutor: 'false'
+  emissaryExecutor: 'true'
   managedStorageEnabled: 'false'
   #
 ---
@@ -831,7 +831,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.2.3/docs/workflow-controller-configmap.yaml
 
   # emissary executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654.
-  containerRuntimeExecutor: 'docker'
+  containerRuntimeExecutor: 'emissary'
 
   # Note, some-string-{{without}}-template-interpretation is a way to avoid some brackets interpreted as template.
   # Reference: https://github.com/helm/helm/issues/2798#issuecomment-467319526
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 a275b358c5b..1695f9484fe 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
@@ -12,7 +12,7 @@ metadata:
 data:
   appName: 'my-release'
   namespace: 'kubeflow'
-  emissaryExecutor: 'false'
+  emissaryExecutor: 'true'
   managedStorageEnabled: 'true'
   #
   managedStorageCloudSqlInstanceConnectionName: 'myproject:us-central1:myinstance'
@@ -889,7 +889,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.2.3/docs/workflow-controller-configmap.yaml
 
   # emissary executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654.
-  containerRuntimeExecutor: 'docker'
+  containerRuntimeExecutor: 'emissary'
 
   # Note, some-string-{{without}}-template-interpretation is a way to avoid some brackets interpreted as template.
   # Reference: https://github.com/helm/helm/issues/2798#issuecomment-467319526
diff --git a/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml b/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml
index bc9dba5444b..f7056046f5c 100644
--- a/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml
+++ b/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml
@@ -12,7 +12,7 @@ metadata:
 data:
   appName: 'my-release'
   namespace: 'kubeflow'
-  emissaryExecutor: 'false'
+  emissaryExecutor: 'true'
   managedStorageEnabled: 'true'
   #
   managedStorageCloudSqlInstanceConnectionName: 'myproject:us-central1:myinstance'
@@ -889,7 +889,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.2.3/docs/workflow-controller-configmap.yaml
 
   # emissary executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654.
-  containerRuntimeExecutor: 'docker'
+  containerRuntimeExecutor: 'emissary'
 
   # Note, some-string-{{without}}-template-interpretation is a way to avoid some brackets interpreted as template.
   # Reference: https://github.com/helm/helm/issues/2798#issuecomment-467319526
diff --git a/manifests/kustomize/third-party/argo/base/workflow-controller-configmap-patch.yaml b/manifests/kustomize/third-party/argo/base/workflow-controller-configmap-patch.yaml
index e4ce749240e..84ac5b642bb 100644
--- a/manifests/kustomize/third-party/argo/base/workflow-controller-configmap-patch.yaml
+++ b/manifests/kustomize/third-party/argo/base/workflow-controller-configmap-patch.yaml
@@ -9,7 +9,7 @@ data:
   # * https://github.com/argoproj/argo-workflows/blob/v3.2.3/docs/workflow-controller-configmap.yaml
 
   # emissary executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654.
-  containerRuntimeExecutor: docker
+  containerRuntimeExecutor: executor
 
   # In artifactRepository.s3.endpoint, $(kfp-namespace) is needed, because in multi-user mode, pipelines may run in other namespaces.
   artifactRepository: |