diff --git a/hiera/common.yaml b/hiera/common.yaml
index e04d9dfbdc..d5b9aefc65 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -330,7 +330,6 @@ statusbot_auth_nicks:
 - SergeyLukjanov
 - jhesketh
 - lifeless
-- pabelanger
 - pleia2
 - yolanda
 - nibalizer
diff --git a/playbooks/group_vars/all.yaml b/playbooks/group_vars/all.yaml
index d35e32b9d2..b78bca4cc4 100644
--- a/playbooks/group_vars/all.yaml
+++ b/playbooks/group_vars/all.yaml
@@ -169,7 +169,6 @@ base_users:
   - corvus
   - clarkb
   - fungi
-  - pabelanger
   - ianw
   - frickler
 # Default empty list of users to install on specific hosts or groups
@@ -184,5 +183,6 @@ disabled_users:
   - rcarrillocruz
   - shrews
   - dmsimard
+  - pabelanger
 
 gerrit_ssh_rsa_pubkey_contents: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+pCQlTAQYmCrOY6aPbvbyKQDcOCXibPNGIjnPPMuEItCS0vtRnqEBz7znWZS5Drq9yKpROh6uFF01ao2VnNjw6f+NdRNV19RWVe6mYN+qa2VrH2caLwBrKPiH0Xc/eK41D55dZU7IWwKYAw/NpiBaBfHavFwipI+rmEb68MH2hcimDdr/bji+0hkh3X+42dkNvmMdtkuCW6nKdAEhnXaHZc5SJR/EvzgRCfB8vbML13p46O9xhoJgn7ZWvMb3vaR5jxIkQwstUR36raEVhttBDEuWasWnHYbrM1zd3ooudbTEQf5vXISZKFygHyJFFqb4iQ76i+hDlb0VQKZCdaol gerrit-code-review@829f141b0fa5