diff --git a/models/vulninfos.go b/models/vulninfos.go
index b819eaf7..0ae69e2a 100644
--- a/models/vulninfos.go
+++ b/models/vulninfos.go
@@ -275,7 +275,7 @@ func (v VulnInfo) Mitigations(myFamily string) (values []CveContentStr) {
 
 // Cvss2Scores returns CVSS V2 Scores
 func (v VulnInfo) Cvss2Scores(myFamily string) (values []CveContentCvss) {
-	order := []CveContentType{Nvd, NvdXML, RedHat, Jvn}
+	order := []CveContentType{Nvd, NvdXML, RedHatAPI, RedHat, Jvn}
 	if myFamily != config.RedHat && myFamily != config.CentOS {
 		order = append(order, NewCveContentType(myFamily))
 	}
@@ -297,26 +297,6 @@ func (v VulnInfo) Cvss2Scores(myFamily string) (values []CveContentCvss) {
 		}
 	}
 
-	for _, v := range values {
-		if v.Type == RedHat {
-			return
-		}
-	}
-	// Set the CVSS v2 score of vuln that exists only in gost.
-	// Unfixed vulnerabilities detected by gost are not in OVAL, because
-	// OVAL data has only vulnerabilities for already fixed.
-	if cont, found := v.CveContents[RedHatAPI]; found {
-		values = append(values, CveContentCvss{
-			Type: RedHatAPI,
-			Value: Cvss{
-				Type:     CVSS2,
-				Score:    cont.Cvss2Score,
-				Vector:   cont.Cvss2Vector,
-				Severity: strings.ToUpper(cont.Cvss2Severity),
-			},
-		})
-	}
-
 	for _, adv := range v.DistroAdvisories {
 		if adv.Severity != "" {
 			values = append(values, CveContentCvss{
@@ -359,7 +339,7 @@ func (v VulnInfo) Cvss2Scores(myFamily string) (values []CveContentCvss) {
 
 // Cvss3Scores returns CVSS V3 Score
 func (v VulnInfo) Cvss3Scores() (values []CveContentCvss) {
-	order := []CveContentType{Nvd, RedHat, Jvn}
+	order := []CveContentType{Nvd, RedHatAPI, RedHat, Jvn}
 	for _, ctype := range order {
 		if cont, found := v.CveContents[ctype]; found {
 			// https://nvd.nist.gov/vuln-metrics/cvss
@@ -374,27 +354,6 @@ func (v VulnInfo) Cvss3Scores() (values []CveContentCvss) {
 			})
 		}
 	}
-
-	for _, v := range values {
-		if v.Type == RedHat {
-			return
-		}
-	}
-
-	// Set the CVSS v3 score of vuln that exists only in gost.
-	// Unfixed vulnerabilities detected by gost are not in OVAL, because
-	// OVAL data has only vulnerabilities for already fixed.
-	if cont, found := v.CveContents[RedHatAPI]; found {
-		values = append(values, CveContentCvss{
-			Type: RedHatAPI,
-			Value: Cvss{
-				Type:     CVSS3,
-				Score:    cont.Cvss3Score,
-				Vector:   cont.Cvss3Vector,
-				Severity: strings.ToUpper(cont.Cvss3Severity),
-			},
-		})
-	}
 	return
 }