diff --git a/go.mod b/go.mod
index f9fa3b7a18..fd9f7bb6de 100644
--- a/go.mod
+++ b/go.mod
@@ -45,7 +45,6 @@ require (
 	k8s.io/api v0.17.3
 	k8s.io/apimachinery v0.17.3
 	k8s.io/client-go v11.0.0+incompatible
-	k8s.io/code-generator v0.17.2
 	k8s.io/klog v1.0.0
 	k8s.io/kube-openapi v0.0.0-20200204173128-addea2498afe // indirect
 	k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab // indirect
diff --git a/go.sum b/go.sum
index 3ecd73321e..4cccd6b784 100644
--- a/go.sum
+++ b/go.sum
@@ -391,10 +391,6 @@ github.com/lyft/flyteidl v0.17.9 h1:JXT9PovHqS9V3YN74x9zWT0kvIEL48c2uNoujF1KMes=
 github.com/lyft/flyteidl v0.17.9/go.mod h1:/zQXxuHO11u/saxTTZc8oYExIGEShXB+xCB1/F1Cu20=
 github.com/lyft/flyteidl v0.17.24 h1:N5mmk2/0062VjbIeUXLHWVZwkxGW20RdZtshaea2nL0=
 github.com/lyft/flyteidl v0.17.24/go.mod h1:/zQXxuHO11u/saxTTZc8oYExIGEShXB+xCB1/F1Cu20=
-github.com/lyft/flyteplugins v0.3.21 h1:0PaQ5CZkUY07cNiBPcxdL1Pm26A0QRwoFw1VT6ly8tU=
-github.com/lyft/flyteplugins v0.3.21/go.mod h1:NDhdkOAn2q6p7YLq9a0/lxyS0dburoAEgipOY5TiO8A=
-github.com/lyft/flyteplugins v0.3.22 h1:CvqlpL5JQTfgtqBNtl91II2jjRyceMTxvyF8qfzAY/M=
-github.com/lyft/flyteplugins v0.3.22/go.mod h1:NDhdkOAn2q6p7YLq9a0/lxyS0dburoAEgipOY5TiO8A=
 github.com/lyft/flyteplugins v0.3.23 h1:cN6d6f1ZkoHw+HD4wFCSVFVv+sCSeyx13E+hXIYEDzo=
 github.com/lyft/flyteplugins v0.3.23/go.mod h1:NDhdkOAn2q6p7YLq9a0/lxyS0dburoAEgipOY5TiO8A=
 github.com/lyft/flytestdlib v0.3.0/go.mod h1:LJPPJlkFj+wwVWMrQT3K5JZgNhZi2mULsCG4ZYhinhU=
diff --git a/pkg/controller/nodes/subworkflow/launchplan/admin.go b/pkg/controller/nodes/subworkflow/launchplan/admin.go
index 6a29b5a27f..e1b34a8cbb 100644
--- a/pkg/controller/nodes/subworkflow/launchplan/admin.go
+++ b/pkg/controller/nodes/subworkflow/launchplan/admin.go
@@ -48,7 +48,7 @@ func (a *adminLaunchPlanExecutor) Launch(ctx context.Context, launchCtx LaunchCo
 		Spec: &admin.ExecutionSpec{
 			LaunchPlan: launchPlanRef,
 			Metadata: &admin.ExecutionMetadata{
-				Mode:                admin.ExecutionMetadata_SYSTEM,
+				Mode:                admin.ExecutionMetadata_CHILD_WORKFLOW,
 				Nesting:             launchCtx.NestingLevel + 1,
 				Principal:           launchCtx.Principal,
 				ParentNodeExecution: launchCtx.ParentNodeExecution,
diff --git a/pkg/controller/nodes/subworkflow/launchplan/admin_test.go b/pkg/controller/nodes/subworkflow/launchplan/admin_test.go
index 4f303ce989..9b78eb49da 100644
--- a/pkg/controller/nodes/subworkflow/launchplan/admin_test.go
+++ b/pkg/controller/nodes/subworkflow/launchplan/admin_test.go
@@ -147,7 +147,8 @@ func TestAdminLaunchPlanExecutor_Launch(t *testing.T) {
 		mockClient.On("CreateExecution",
 			ctx,
 			mock.MatchedBy(func(o *admin.ExecutionCreateRequest) bool {
-				return o.Project == "p" && o.Domain == "d" && o.Name == "n" && o.Spec.Inputs == nil
+				return o.Project == "p" && o.Domain == "d" && o.Name == "n" && o.Spec.Inputs == nil &&
+					o.Spec.Metadata.Mode == admin.ExecutionMetadata_CHILD_WORKFLOW
 			}),
 		).Return(nil, nil)
 		assert.NoError(t, err)