diff --git a/roles/fasjson/files/aliases.static b/roles/fasjson/files/aliases.static
index 5faaf69413..39580f3628 100644
--- a/roles/fasjson/files/aliases.static
+++ b/roles/fasjson/files/aliases.static
@@ -177,9 +177,11 @@ dei: fpl,fca,jonatoni
 diversity: dei
 diversity-inclusion: dei
 
-# Code of Conduct Committee
-# https://docs.fedoraproject.org/en-US/project/coc-committee/
-codeofconduct: fpl,fca,riecatnor,jonatoni,dvolavko,dcantrell
+# Code of Conduct (CoC) Committee
+## https://docs.fedoraproject.org/en-US/project/coc-committee/
+codeofconduct: fpl, fca, jonatoni, dcantrell, jberkus, nimbinatus
+## a special CoC sub-committee for on-site response at Flock to Fedora contributor conference
+flock-coc: codeofconduct, dvolavko, npazmino@redhat.com, shaunm@redhat.com, spotz
 
 # Fedora Matrix admin
 matrixadmin: fpl,fca,kevin,nb
@@ -211,7 +213,6 @@ fudcon-latam: flock-admin
 #flockinfo: fca,fpl
 flock-staff: fca,fpl,foa,dvolavko,shaunm@redhat.com,npazmino@redhat.com,spotz
 #flock-admin: flock-staff
-flock-coc: codeofconduct,dvolavko,shaunm@redhat.com,npazmino@redhat.com,spotz
 #flock-access: flock-admin
 #
 # flock/sponsor alias