diff --git a/config/config.go b/config/config.go
index 48fb22c83b84..ee9f2d1e7bd6 100644
--- a/config/config.go
+++ b/config/config.go
@@ -107,7 +107,7 @@ type Config struct {
 	InitialDelay metav1.Duration `json:"initialDelay,omitempty"`
 
 	// The command/args for each image, needed when the command is not specified and the emissary executor is used.
-	// https://argoproj.github.io/argo-workflows/workflow-executors/#emissary
+	// https://argoproj.github.io/argo-workflows/workflow-executors/#emissary-emissary
 	Images map[string]Image `json:"images,omitempty"`
 }
 
diff --git a/docs/workflow-controller-configmap.yaml b/docs/workflow-controller-configmap.yaml
index 06de54f3b1c4..ef8e9f06e7f6 100644
--- a/docs/workflow-controller-configmap.yaml
+++ b/docs/workflow-controller-configmap.yaml
@@ -136,7 +136,7 @@ data:
   kubeletInsecure: false
 
   # The command/args for each image, needed when the command is not specified and the emissary executor is used.
-  # https://argoproj.github.io/argo-workflows/workflow-executors/#emissary
+  # https://argoproj.github.io/argo-workflows/workflow-executors/#emissary-emissary
   images: |
     argoproj/argosay:v1:
       command: [cowsay]
diff --git a/hack/test-examples.sh b/hack/test-examples.sh
index 5b4193ecadb7..6d8f635746ff 100755
--- a/hack/test-examples.sh
+++ b/hack/test-examples.sh
@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-./dist/argo delete -l workflows.argoproj.io/test
-
 grep -lR 'workflows.argoproj.io/test' examples/* | while read f ; do
-    ./dist/argo submit --watch --verify $f
+  ./dist/argo delete -l workflows.argoproj.io/test
+  ./dist/argo submit --watch --verify $f
 done
diff --git a/workflow/controller/workflowpod.go b/workflow/controller/workflowpod.go
index ffdb22f513be..7f4c85d5b4dd 100644
--- a/workflow/controller/workflowpod.go
+++ b/workflow/controller/workflowpod.go
@@ -307,7 +307,7 @@ func (woc *wfOperationCtx) createWorkflowPod(ctx context.Context, nodeName strin
 					}
 				}
 				if len(c.Command) == 0 {
-					return nil, fmt.Errorf("when using the emissary executor you must either explicitly specify the command, or list the image's command in the index: https://argoproj.github.io/argo-workflows/workflow-executors/#emissary")
+					return nil, fmt.Errorf("when using the emissary executor you must either explicitly specify the command, or list the image's command in the index: https://argoproj.github.io/argo-workflows/workflow-executors/#emissary-emissary")
 				}
 				c.Command = append([]string{"/var/run/argo/argoexec", "emissary", "--"}, c.Command...)
 			}
@@ -542,13 +542,8 @@ func (woc *wfOperationCtx) createEnvVars() []apiv1.EnvVar {
 		execEnvVars = append(execEnvVars, woc.controller.Config.Executor.Env...)
 	}
 	switch woc.getContainerRuntimeExecutor() {
-	case common.ContainerRuntimeExecutorK8sAPI:
 	case common.ContainerRuntimeExecutorKubelet:
 		execEnvVars = append(execEnvVars,
-			apiv1.EnvVar{
-				Name:  common.EnvVarContainerRuntimeExecutor,
-				Value: woc.getContainerRuntimeExecutor(),
-			},
 			apiv1.EnvVar{
 				Name: common.EnvVarDownwardAPINodeIP,
 				ValueFrom: &apiv1.EnvVarSource{