diff --git a/cves/2022/CVE-2021-22911.yaml b/cves/2022/CVE-2021-22911.yaml
index d38988a19c..87dbd5eb98 100644
--- a/cves/2022/CVE-2021-22911.yaml
+++ b/cves/2022/CVE-2021-22911.yaml
@@ -17,9 +17,9 @@ info:
     cve-id: CVE-2021-22911
     cwe-id: CWE-89
   metadata:
-    verified: true
     shodan-query: http.title:"Rocket.Chat"
-  tags: cve,cve2021,rocketchat,nosqli
+    verified: "true"
+  tags: rocketchat,nosqli,packetstorm,vulhub,hackerone,cve,cve2021
 
 requests:
   - raw:
diff --git a/cves/2022/CVE-2022-36804.yaml b/cves/2022/CVE-2022-36804.yaml
index e2289993a2..c2926b7872 100644
--- a/cves/2022/CVE-2022-36804.yaml
+++ b/cves/2022/CVE-2022-36804.yaml
@@ -18,7 +18,7 @@ info:
     cwe-id: CWE-77
   metadata:
     shodan-query: http.component:"BitBucket"
-  tags: cve,cve2022,bitbucket,atlassian
+  tags: cve,cve2022,bitbucket,atlassian,kev
 
 variables:
   data: '{{rand_base(5)}}'