diff --git a/projects/tpm2-tss/build.sh b/projects/tpm2-tss/build.sh
index 53524b4b6..f120a2941 100644
--- a/projects/tpm2-tss/build.sh
+++ b/projects/tpm2-tss/build.sh
@@ -19,7 +19,9 @@ cd $SRC/tpm2-tss/
 
 export LD_LIBRARY_PATH=/usr/local/bin
 
-GEN_FUZZ=1 ./bootstrap
+export GEN_FUZZ=1
+
+./bootstrap
 ./configure \
   CC=clang \
   CXX=clang++ \
diff --git a/projects/tpm2-tss/project.yaml b/projects/tpm2-tss/project.yaml
index c7061578c..20cd03167 100644
--- a/projects/tpm2-tss/project.yaml
+++ b/projects/tpm2-tss/project.yaml
@@ -1,5 +1,7 @@
 homepage: "https://github.com/tpm2-software/tpm2-tss"
 primary_contact: "tadeusz.struk@intel.com"
+auto_ccs:
+  - "john.s.andersen@intel.com"
 sanitizers:
   - address
   - memory