diff --git a/roles/fas_client/files/aliases.template b/roles/fas_client/files/aliases.template
index a655be7d20..7956891543 100644
--- a/roles/fas_client/files/aliases.template
+++ b/roles/fas_client/files/aliases.template
@@ -112,16 +112,21 @@ pkgdb: /dev/null
 
 vendors: distribution-members
 
+# Fedora Council
 legal: spot@redhat.com
 fpl: chair
-board: advisory-board@lists.fedoraproject.org
+board: council-private@lists.fedoraproject.org
 chairman: chair
 directors: board
 
-# This is the one place to change FPL identity, re:
-# https://fedoraproject.org/wiki/Project_Leader
+## Fedora Project Leader (FPL)
+## https://docs.fedoraproject.org/fedora-project/council/fpl.html
 chair: mattdm
 
+## Fedora Community Action and Impact Coordinator
+## https://docs.fedoraproject.org/fedora-project/council/fcaic.html
+fcaic: bex
+
 # FESCo
 fesco-chair: kevin
 fesco: fesco@lists.fedoraproject.org
@@ -142,9 +147,9 @@ fudcon-cfp: /dev/null
 fudcon-paper:    fudcon-cfp
 
 # flock
-flockpress: bex,fpl
-flockinfo: bex,fpl
-flock-staff: bex,fpl,duffy,sgallagh
+flockpress: fcaic,fpl
+flockinfo: fcaic,fpl
+flock-staff: fcaic,fpl,duffy,sgallagh
 
 # gnome backups
 gnomebackup: backups@gnome.org
@@ -163,7 +168,6 @@ infra-security: puiterwijk
 webmaster: websites@lists.fedoraproject.org
 logo: rlerch@redhat.com,duffy@redhat.com
 ham-radio-exams: nb,codeblock,gholms
-diversity: tatica
 
 # Misc Aliases
 cvs-access: accounts
@@ -345,9 +349,5 @@ blockerbugs: tflink+blockerbugs@redhat.com
 releng-team: mohanboddu,parasense,kellin
 containerbuild: maxamillion
 
-# Fedora Community Action and Impact Coordinator
-# https://fedoraproject.org/wiki/Community_Leader
-fcaic: bex
-
 #### The rest of this file is automatically generated - edit using the accounts system!