diff --git a/cluster/cluster_set.go b/cluster/cluster_set.go
index 8d2933ec9..97ce72ebc 100644
--- a/cluster/cluster_set.go
+++ b/cluster/cluster_set.go
@@ -462,6 +462,18 @@ func (cluster *Cluster) SetCloud18InfraCPUModel(value string) {
 	cluster.Conf.Cloud18InfraCPUModel = value
 }
 
+func (cluster *Cluster) SetCloud18ExternalSysOps(value string) {
+	cluster.Conf.Cloud18ExternalSysOps = value
+}
+
+func (cluster *Cluster) SetCloud18ExternalDbOps(value string) {
+	cluster.Conf.Cloud18ExternalDbOps = value
+}
+
+func (cluster *Cluster) SetCloud18InfraCertifications(value string) {
+	cluster.Conf.Cloud18InfraCertifications = value
+}
+
 func (cluster *Cluster) SetCloud18InfraCPUFreq(value string) {
 	cluster.Conf.Cloud18InfraCPUFreq = value
 }
@@ -1299,6 +1311,9 @@ func (cluster *Cluster) SetServicePlanInfos(theplan string) error {
 			cluster.SetCloud18CostCurrency(plan.Devise)
 			cluster.SetCloud18InfraCPUFreq(plan.CPUFreq)
 			cluster.SetCloud18InfraCPUModel(plan.CPU)
+			cluster.SetCloud18InfraCertifications(plan.Certs)
+			cluster.SetCloud18ExternalDbOps(plan.ExtDbOps)
+			cluster.SetCloud18ExternalSysOps(plan.ExtSysOps)
 			cluster.SetCloud18InfraDescription(plan.Infra)
 			cluster.SetCloud18InfraDataCenters(plan.DC)
 			cluster.SetCloud18InfraPublicBandwidth(plan.BP)
diff --git a/config/config.go b/config/config.go
index 7572ba63b..82fa58b46 100644
--- a/config/config.go
+++ b/config/config.go
@@ -700,6 +700,10 @@ type Config struct {
 	Cloud18InfraDataCenters                   string                 `mapstructure:"cloud18-infra-data-centers"  toml:"cloud18-infra-data-centers" json:"cloud18InfraDataCenters"`
 	Cloud18InfraPublicBandwidth               float64                `mapstructure:"cloud18-infra-public-bandwidth"  toml:"cloud18-infra-public-bandwidth" json:"cloud18InfraPublicBandwidth"`
 	Cloud18InfraGeoLocalizations              string                 `mapstructure:"cloud18-infra-geo-localizations"  toml:"cloud18-infra-geo-localizations" json:"cloud18InfraGeoLocalizations"`
+	Cloud18DbOps                              string                 `mapstructure:"cloud18-dbops"  toml:"cloud18-dbops" json:"cloud18DbOps"`
+	Cloud18ExternalDbOps                      string                 `mapstructure:"cloud18-external-dbops"  toml:"cloud18-external-dbops" json:"cloud18ExternalDbOps"`
+	Cloud18ExternalSysOps                     string                 `mapstructure:"cloud18-external-sysops" toml:"cloud18-external-sysops" json:"cloud18ExternalSysOps"`
+	Cloud18InfraCertifications                string                 `mapstructure:"cloud18-infra-certifications"  toml:"cloud18-infra-certifications" json:"cloud18InfraCertifications"`
 	Cloud18OpenDbops                          bool                   `mapstructure:"cloud18-open-dbops"  toml:"cloud18-open-dbops" json:"cloud18OpenDbops"`
 	Cloud18SubscribedDbops                    bool                   `mapstructure:"cloud18-subscribed-dbops"  toml:"cloud18-subscribed-dbops" json:"cloud18SubscribedDbops"`
 	Cloud18OpenSysops                         bool                   `mapstructure:"cloud18-open-sysops"  toml:"cloud18-open-sysops" json:"cloud18OpenSysops"`
@@ -785,6 +789,9 @@ type PeerCluster struct {
 	Cloud18SlaRepairTime                   float64  `json:"cloud18-sla-repair-time,string"`
 	Cloud18SlaProvisionTime                float64  `json:"cloud18-sla-provision-time,string"`
 	Cloud18PromotionPct                    float64  `json:"cloud18-promotion-pct,string"`
+	Cloud18ExtDbOps                        string   `json:"cloud18-external-dbops"`
+	Cloud18ExtSysOps                       string   `json"cloud18-external-sysops"`
+	Cloud18InfraCertifications             string   `json:"cloud18-infra-certifications"`
 }
 
 // Compliance created in OpenSVC collector and exported as JSON
@@ -900,6 +907,9 @@ type ServicePlan struct {
 	ProvisionTime float64 `json:"provtime,string"`
 	PromotionPct  float64 `json:"promo,string"`
 	BP            float64 `json:"bp,string"`
+	Certs         string  `json:"certs"`
+	ExtDbOps      string  `json:"extdbops"`
+	ExtSysOps     string  `json:"extsysops"`
 }
 
 type DockerTag struct {
diff --git a/server/server.go b/server/server.go
index ebdd58b51..c7c480c98 100644
--- a/server/server.go
+++ b/server/server.go
@@ -866,6 +866,10 @@ func (repman *ReplicationManager) AddFlags(flags *pflag.FlagSet, conf *config.Co
 	flags.StringVar(&conf.Cloud18DatabaseReadWriteSrvRecord, "cloud18-database-read-write-srv-record", "", "Database read write  SRV record host:port")
 	flags.StringVar(&conf.Cloud18DbaUserCredentials, "cloud18-dba-user-credentials", "", "Database credential")
 	flags.StringVar(&conf.Cloud18CostCurrency, "cloud18-cost-currency", "", "Cost currency")
+	flags.StringVar(&conf.Cloud18DbOps, "cloud18-dbops", "", "Email for infrastucure dba")
+	flags.StringVar(&conf.Cloud18ExternalDbOps, "cloud18-external-dbops", "", "Email for external partner dba")
+	flags.StringVar(&conf.Cloud18ExternalSysOps, "cloud18-external-dbops", "", "Email for external partner sysadmin")
+	flags.StringVar(&conf.Cloud18InfraCertifications, "cloud18-infra-certifications", "", "The type of auditing certificats made on the infrastructure")
 	if WithProvisioning == "ON" {
 		flags.StringVar(&conf.ProvDatadirVersion, "prov-db-datadir-version", "10.2", "Empty datadir to deploy for localtest")
 		flags.StringVar(&conf.ProvDiskSystemSize, "prov-db-disk-system-size", "2", "Disk in g for micro service VM")