diff --git a/cves/2019/CVE-2019-12985.yaml b/cves/2019/CVE-2019-12985.yaml
index f83c3bc2dd..e876e9e1b8 100644
--- a/cves/2019/CVE-2019-12985.yaml
+++ b/cves/2019/CVE-2019-12985.yaml
@@ -9,14 +9,15 @@ info:
   reference:
     - https://nvd.nist.gov/vuln/detail/CVE-2019-12985
     - https://www.tenable.com/security/research/tra-2019-31
+    - https://support.citrix.com/article/CTX251987
   classification:
-    cvss-metrics: CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H
+    cvss-metrics: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H
     cvss-score: 9.8
     cve-id: CVE-2019-12985
     cwe-id: CWE-78
   metadata:
     shodan-query: http.title:"Citrix SD-WAN"
-  tags: cve,cve2019,citrix,rce,unauth,oast
+  tags: cve,cve2019,citrix,rce,unauth,oast,tenable
 
 requests:
   - raw:
diff --git a/cves/2019/CVE-2019-12986.yaml b/cves/2019/CVE-2019-12986.yaml
index abed416b70..89ca0154ad 100644
--- a/cves/2019/CVE-2019-12986.yaml
+++ b/cves/2019/CVE-2019-12986.yaml
@@ -9,14 +9,15 @@ info:
   reference:
     - https://nvd.nist.gov/vuln/detail/CVE-2019-12986
     - https://www.tenable.com/security/research/tra-2019-31
+    - https://support.citrix.com/article/CTX251987
   classification:
-    cvss-metrics: CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H
+    cvss-metrics: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H
     cvss-score: 9.8
     cve-id: CVE-2019-12986
     cwe-id: CWE-78
   metadata:
     shodan-query: http.title:"Citrix SD-WAN"
-  tags: cve,cve2019,citrix,rce,unauth,oast
+  tags: unauth,oast,tenable,cve,cve2019,citrix,rce
 
 requests:
   - raw:
diff --git a/cves/2019/CVE-2019-12987.yaml b/cves/2019/CVE-2019-12987.yaml
index f4e49e6de4..a168fb2620 100644
--- a/cves/2019/CVE-2019-12987.yaml
+++ b/cves/2019/CVE-2019-12987.yaml
@@ -9,14 +9,15 @@ info:
   reference:
     - https://nvd.nist.gov/vuln/detail/CVE-2019-12987
     - https://www.tenable.com/security/research/tra-2019-31
+    - https://support.citrix.com/article/CTX251987
   classification:
-    cvss-metrics: CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H
+    cvss-metrics: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H
     cvss-score: 9.8
     cve-id: CVE-2019-12987
     cwe-id: CWE-78
   metadata:
     shodan-query: http.title:"Citrix SD-WAN"
-  tags: cve,cve2019,citrix,rce,unauth,oast
+  tags: citrix,rce,unauth,oast,tenable,cve,cve2019
 
 requests:
   - raw:
diff --git a/cves/2019/CVE-2019-12988.yaml b/cves/2019/CVE-2019-12988.yaml
index 44d5d113ce..98c26525f3 100644
--- a/cves/2019/CVE-2019-12988.yaml
+++ b/cves/2019/CVE-2019-12988.yaml
@@ -9,14 +9,15 @@ info:
   reference:
     - https://nvd.nist.gov/vuln/detail/CVE-2019-12988
     - https://www.tenable.com/security/research/tra-2019-31
+    - https://support.citrix.com/article/CTX251987
   classification:
-    cvss-metrics: CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H
+    cvss-metrics: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H
     cvss-score: 9.8
     cve-id: CVE-2019-12988
     cwe-id: CWE-78
   metadata:
     shodan-query: http.title:"Citrix SD-WAN"
-  tags: cve,cve2019,citrix,rce,unauth,oast
+  tags: rce,unauth,oast,tenable,cve,cve2019,citrix
 
 requests:
   - raw:
diff --git a/cves/2019/CVE-2019-12990.yaml b/cves/2019/CVE-2019-12990.yaml
index 3028bead01..8700e538af 100644
--- a/cves/2019/CVE-2019-12990.yaml
+++ b/cves/2019/CVE-2019-12990.yaml
@@ -9,14 +9,15 @@ info:
   reference:
     - https://nvd.nist.gov/vuln/detail/CVE-2019-12990
     - https://www.tenable.com/security/research/tra-2019-31
+    - https://support.citrix.com/search?searchQuery=*&lang=en&sort=relevance&prod=&pver=&ct=Security+Bulletin
   classification:
-    cvss-metrics: CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H
+    cvss-metrics: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H
     cvss-score: 9.8
     cve-id: CVE-2019-12990
     cwe-id: CWE-22
   metadata:
     shodan-query: http.title:"Citrix SD-WAN"
-  tags: cve,cve2019,citrix,rce,unauth
+  tags: cve,cve2019,citrix,rce,unauth,tenable
 
 requests:
   - raw: