diff --git a/projects/cryptofuzz/project.yaml b/projects/cryptofuzz/project.yaml
index 4c0342a20..d7096ae35 100644
--- a/projects/cryptofuzz/project.yaml
+++ b/projects/cryptofuzz/project.yaml
@@ -2,45 +2,47 @@ homepage: "https://github.com/guidovranken/cryptofuzz"
 language: c++
 primary_contact: "guidovranken@gmail.com"
 auto_ccs:
-    - "openssl-security@openssl.org"
-    - "kurt@roeckx.be"
-    - "caswell.matt@googlemail.com"
-    - "agl@google.com"
-    - "davidben@google.com"
-    - "svaldez@google.com"
-    - "beck@obtuse.com"
-    - "joel.sing@gmail.com"
-    - "kinichiro.inoguchi@gmail.com"
-    - "github@pureftpd.org"
-    - "jussi.kivilinna@gmail.com"
-    - "szanella@gmail.com"
-    - "karthik.bhargavan@gmail.com"
-    - "jonathan.protzenko@gmail.com"
-    - "richard@levitte.org"
-    - "ppzgs1@gmail.com"
-    - "jack.lloyd@gmail.com"
-    - "shane.lontis@hotmail.com"
-    - "david@wolfssl.com"
-    - "kaleb@wolfssl.com"
-    - "jacob@wolfssl.com"
-    - "sledru@mozilla.com"
-    - "bbeurdouche@mozilla.com"
-    - "matthias.st.pierre@gmail.com"
-    - "kaleb.himes@gmail.com"
-    - "polubelovam@gmail.com"
-    - "mbed-tls-security@lists.trustedfirmware.org"
-    - "choller@mozilla.com"
-    - "djackson@mozilla.com"
-    - "dkeeler@mozilla.com"
-    - "jkratzer@mozilla.com"
-    - "jschanck@mozilla.com"
-    - "jschwartzentruber@mozilla.com"
-    - "nkulatova@mozilla.com"
-    - "twsmith@mozilla.com"
+  - openssl-security@openssl.org
+  - kurt@roeckx.be
+  - caswell.matt@googlemail.com
+  - agl@google.com
+  - davidben@google.com
+  - svaldez@google.com
+  - beck@obtuse.com
+  - joel.sing@gmail.com
+  - kinichiro.inoguchi@gmail.com
+  - github@pureftpd.org
+  - jussi.kivilinna@gmail.com
+  - szanella@gmail.com
+  - karthik.bhargavan@gmail.com
+  - jonathan.protzenko@gmail.com
+  - richard@levitte.org
+  - ppzgs1@gmail.com
+  - jack.lloyd@gmail.com
+  - shane.lontis@hotmail.com
+  - david@wolfssl.com
+  - kaleb@wolfssl.com
+  - jacob@wolfssl.com
+  - sledru@mozilla.com
+  - bbeurdouche@mozilla.com
+  - matthias.st.pierre@gmail.com
+  - kaleb.himes@gmail.com
+  - polubelovam@gmail.com
+  - mbed-tls-security@lists.trustedfirmware.org
+  - choller@mozilla.com
+  - djackson@mozilla.com
+  - dkeeler@mozilla.com
+  - jkratzer@mozilla.com
+  - jschanck@mozilla.com
+  - jschwartzentruber@mozilla.com
+  - nkulatova@mozilla.com
+  - twsmith@mozilla.com
+vendor_ccs:
+  - oss-fuzz@mozilla-fuzzing.iam.gserviceaccount.com
 sanitizers:
- - address
- - undefined
- - memory
+  - address
+  - undefined
+  - memory
 architectures:
- - x86_64
+  - x86_64
 main_repo: 'https://github.com/guidovranken/cryptofuzz'
diff --git a/projects/firefox/project.yaml b/projects/firefox/project.yaml
index 350f84c85..13bca6539 100644
--- a/projects/firefox/project.yaml
+++ b/projects/firefox/project.yaml
@@ -1,9 +1,12 @@
 homepage: "https://www.mozilla.org/firefox/"
 language: c++
+main_repo: https://hg.mozilla.org/mozilla-central/
 primary_contact: "choller@mozilla.com"
 auto_ccs:
   - twsmith@mozilla.com
   - sledru@mozilla.com
+vendor_ccs:
+  - oss-fuzz@mozilla-fuzzing.iam.gserviceaccount.com
 fuzzing_engines:
   - libfuzzer
 sanitizers:
diff --git a/projects/nss/project.yaml b/projects/nss/project.yaml
index f4684420c..a3dfe6b7c 100644
--- a/projects/nss/project.yaml
+++ b/projects/nss/project.yaml
@@ -2,14 +2,16 @@ homepage: "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 language: c++
 primary_contact: "bbeurdouche@mozilla.com"
 auto_ccs:
-  - "bbeurdouche@mozilla.com"
-  - "choller@mozilla.com"
-  - "djackson@mozilla.com"
-  - "dkeeler@mozilla.com"
-  - "jkratzer@mozilla.com"
-  - "jschanck@mozilla.com"
-  - "jschwartzentruber@mozilla.com"
-  - "nkulatova@mozilla.com"
-  - "sledru@mozilla.com"
-  - "twsmith@mozilla.com"
+  - bbeurdouche@mozilla.com
+  - choller@mozilla.com
+  - djackson@mozilla.com
+  - dkeeler@mozilla.com
+  - jkratzer@mozilla.com
+  - jschanck@mozilla.com
+  - jschwartzentruber@mozilla.com
+  - nkulatova@mozilla.com
+  - sledru@mozilla.com
+  - twsmith@mozilla.com
+vendor_ccs:
+  - oss-fuzz@mozilla-fuzzing.iam.gserviceaccount.com
 main_repo: "https://hg.mozilla.org/projects/nss"
diff --git a/projects/spidermonkey-ufi/project.yaml b/projects/spidermonkey-ufi/project.yaml
index 3dae682f2..cb0c7c65b 100644
--- a/projects/spidermonkey-ufi/project.yaml
+++ b/projects/spidermonkey-ufi/project.yaml
@@ -1,8 +1,10 @@
 homepage: 'https://searchfox.org/mozilla-central/source/js/src/fuzz-tests/README'
 language: c++
+main_repo: https://hg.mozilla.org/mozilla-central/
 primary_contact: 'choller@mozilla.com'
+vendor_ccs:
+  - oss-fuzz@mozilla-fuzzing.iam.gserviceaccount.com
 fuzzing_engines:
   - libfuzzer
 sanitizers:
   - address
-
diff --git a/projects/spidermonkey/project.yaml b/projects/spidermonkey/project.yaml
index d7635fb32..5169b4b2a 100644
--- a/projects/spidermonkey/project.yaml
+++ b/projects/spidermonkey/project.yaml
@@ -1,9 +1,12 @@
 homepage: "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
 language: c++
+main_repo: https://hg.mozilla.org/mozilla-central/
 primary_contact: "choller@mozilla.com"
 auto_ccs:
   - sledru@mozilla.com
   - twsmith@mozilla.com
+vendor_ccs:
+  - oss-fuzz@mozilla-fuzzing.iam.gserviceaccount.com
 fuzzing_engines:
   - none
 sanitizers: