diff --git a/discovery/pkg/cmd/root.go b/discovery/pkg/cmd/root.go
index 17399531..e358276a 100644
--- a/discovery/pkg/cmd/root.go
+++ b/discovery/pkg/cmd/root.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/Axway/agent-sdk/pkg/apic"
 	corecmd "github.com/Axway/agent-sdk/pkg/cmd"
 	corecfg "github.com/Axway/agent-sdk/pkg/config"
 	"github.com/Axway/agent-sdk/pkg/migrate"
@@ -25,6 +26,9 @@ func init() {
 		corecfg.DiscoveryAgent,   // Agent Type (Discovery or Traceability)
 	)
 
+	// set the dataplane type that will be added to the agent spec
+	corecfg.AgentDataPlaneType = apic.Apigee.String()
+
 	// Get the root command properties and bind the config property in YAML definition
 	rootProps := RootCmd.GetProperties()
 	config.AddProperties(rootProps)
diff --git a/traceability/pkg/cmd/root.go b/traceability/pkg/cmd/root.go
index 9e53f7ac..f2219425 100644
--- a/traceability/pkg/cmd/root.go
+++ b/traceability/pkg/cmd/root.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/Axway/agent-sdk/pkg/apic"
 	corecmd "github.com/Axway/agent-sdk/pkg/cmd"
 	corecfg "github.com/Axway/agent-sdk/pkg/config"
 
@@ -39,6 +40,9 @@ func init() {
 		corecfg.TraceabilityAgent,   // Agent Type (Discovery or Traceability)
 	)
 
+	// set the dataplane type that will be added to the agent spec
+	corecfg.AgentDataPlaneType = apic.Apigee.String()
+
 	// Get the root command properties and bind the config property in YAML definition
 	rootProps := RootCmd.GetProperties()
 	config.AddProperties(rootProps)