diff --git a/contribulyze/contribulyze.aliases b/contribulyze/contribulyze.aliases
index 46f56281..80a50fd5 100644
--- a/contribulyze/contribulyze.aliases
+++ b/contribulyze/contribulyze.aliases
@@ -4,7 +4,7 @@ Adrian Cole,Adrain Cole
 Aleksandr Sorokoumov,Aleksandr Soromoukov,Aleksandr Sorokoumov
 Aleksey Yeschenko,iamaleksey,Aleksey,ayeschenko,Aleksey Yeshchenko,iamaleskey
 Aleksei Zotov,Alexey Zotov,Aleksei Zoto,azotcsit,Alexander Zotov
-Andrés de la Peña,Andres de la Peña,adelapena,Andres de la Pena,adelpena,Andrés de la Peña
+Andrés de la Peña,Andres de la Peña,adelapena,Andres de la Pena,adelpena,Andrés de la Peña,Andrés de la Peña
 Ariel Weisberg,aweisberg,Ariel,awiesberg
 Ben Coverston,bcoverston
 Benedict Elliott Smith,Benedict,bes,Benedict Elliot Smith,belliottsmith,belliotsmith,Benedict Elliott-Smith
@@ -14,6 +14,7 @@ Blake Eggleston,blake,Blake Egglestone,bdeggleston
 Brandon Williams,brandonwilliams,driftx,brandon.williams,brandwonwilliams,brandonwillams,bwilliams,Brandon Williamms,Brandom Williams,brandonwillias
 Branimir Lambov,blambov,branimir
 Carl Yeksigian,carlyeks,carl,cyeksigian
+Charlie Andrews,cwandrews
 Chris Goffinet,goffinet
 Chris Lohfink,clohfink,CHris Lohfink
 Dave Brosius,dbrosius
@@ -48,7 +49,9 @@ Michael Kjellman,mkjellman
 Mick Semb Wever,Michael Semb Wever,Mck SembWever,Michael SembWever,Mck Semb Wever,Mchael Semb Wever,Michaem Semb Wever
 Nate McCall,zznate,Nat McCall
 Ningzi Zhan,ningzi.zhan
+Olivier Michallat,olim7t
 Paul Cannon,paul cannon,pcannon
+Paul Thomas Au,Paul Au
 Paulo Motta,paulo,pauloricardomg,pmotta,Paul Motta
 Pavel Yaskevich,Pavel YAskevich,pyaskevich
 Peter Schuller,scode,pschuller
@@ -63,14 +66,11 @@ Stefania Alborghetti,Stefania
 Stu Hood,stuhood
 Sylvain Lebresne,slebresne,slebresene,Sylvain,pcmanus,slebrense
 Tomek Łasica,Tomasz Lasica,Tomek Lasica
+Tomasz Lelek,tomekl007
 Tyler Hobbs,thobbs,Tyler Lee Hobbs,tylerhobbs,tyler
 Vijay Parthasarathy,Vijay,xedin
 Vinay Chella,vinaychella
-Yifan Cai,ycai
+Yifan Cai,ycai,yifan-c
 Yuki Morishita,Yukim,Yuki,Ymorishita
 Zhao Renhai (赵 仁海),Zhao Renhai
-Zhao Yang,ZhaoYang,Zhao Yang (jasonstack)
-
-
-
-
+Zhao Yang,ZhaoYang,Zhao Yang (jasonstack)
\ No newline at end of file
diff --git a/contribulyze/contribulyze.sh b/contribulyze/contribulyze.sh
index 9b14435b..fb34bc67 100755
--- a/contribulyze/contribulyze.sh
+++ b/contribulyze/contribulyze.sh
@@ -13,10 +13,10 @@ mkdir -p /tmp/contribulyze-repos
 mkdir -p /tmp/contribulyze-html
 cd /tmp/contribulyze-repos
 
-repos=("https://github.com/apache/cassandra.git" "https://github.com/apache/cassandra-dtest.git" "https://github.com/apache/cassandra-builds.git" "https://github.com/apache/cassandra-in-jvm-dtest-api.git" "https://github.com/apache/cassandra-harry.git" "https://github.com/apache/cassandra-website.git" "https://github.com/apache/cassandra-java-driver.git" "https://github.com/datastax/python-driver.git" "https://github.com/apache/cassandra-sidecar.git" "https://github.com/apache/cassandra-analytics.git" "https://github.com/apache/cassandra-accord.git")
+repos=("https://github.com/apache/cassandra.git" "https://github.com/apache/cassandra-dtest.git" "https://github.com/apache/cassandra-builds.git" "https://github.com/apache/cassandra-in-jvm-dtest-api.git" "https://github.com/apache/cassandra-harry.git" "https://github.com/apache/cassandra-website.git" "https://github.com/apache/cassandra-java-driver.git" "https://github.com/apache/cassandra-gocql-driver.git" "https://github.com/datastax/python-driver.git" "https://github.com/apache/cassandra-sidecar.git" "https://github.com/apache/cassandra-analytics.git" "https://github.com/apache/cassandra-accord.git")
 
 # the different groups we want separate contribulyze reports on. note '..' refers to everything.
-groups=('..' 'website_and_docs' 'build_and_tools' 'packaging_and_release' 'test_and_ci' 'cassandra_src' 'cassandra-java-driver' 'python-driver' 'cassandra-sidecar' 'cassandra-analytics' 'cassandra-accord')
+groups=('..' 'website_and_docs' 'build_and_tools' 'packaging_and_release' 'test_and_ci' 'cassandra_src' 'drivers' 'python-driver' 'cassandra-sidecar' 'cassandra-analytics' 'cassandra-accord')
 
 for repo in ${repos[*]} ; do
     git clone --quiet ${repo}
@@ -55,9 +55,8 @@ for group in ${groups[*]} ; do
       groupings=("cassandra/src")
      ;;
 
-     "cassandra-java-driver")
-      groupings=("cassandra-java-driver")
-      #continue # FIXME commit messages in java-driver do not follow the "patch by …; reviewed by … for CASSANDRA-" precedence
+     "drivers")
+      groupings=("cassandra-java-driver" "cassandra-gocql-driver")
      ;;
 
      "python-driver")
@@ -78,7 +77,7 @@ for group in ${groups[*]} ; do
      ;;
 
      *)
-      groupings=("cassandra" "cassandra-dtest" "cassandra-in-jvm-dtest-api" "cassandra-harry" "cassandra-builds" "cassandra-website" "cassandra-java-driver" "cassandra-sidecar" "cassandra-analytics" "cassandra-accord")
+      groupings=("cassandra" "cassandra-dtest" "cassandra-in-jvm-dtest-api" "cassandra-harry" "cassandra-builds" "cassandra-website" "cassandra-java-driver" "cassandra-gocql-driver" "cassandra-sidecar" "cassandra-analytics" "cassandra-accord")
       ;;
     esac