diff --git a/hiera/common.yaml b/hiera/common.yaml
index 6fff2a7503..a43c75e22d 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -344,7 +344,6 @@ statusbot_auth_nicks:
 - rcarrillocruz
 - ianw
 - Shrews
-- dmsimard
 - frickler
 mosquitto_tls_ca_file: |
   -----BEGIN CERTIFICATE-----
diff --git a/playbooks/group_vars/all.yaml b/playbooks/group_vars/all.yaml
index 9a1324362f..151c47fb52 100644
--- a/playbooks/group_vars/all.yaml
+++ b/playbooks/group_vars/all.yaml
@@ -137,12 +137,6 @@ all_users:
     uid: 2027
     gid: 2027
 
-  dmsimard:
-    comment: David Moreau-Simard
-    key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDyXfFj44OTsJZnHbecbYrwA8zXuMiULb+o326maOh3wh5/6fk+MzivkUzJC2uZqAlKvBnNXsrb/07eV1gRjaIQBQJxaV9HQUwMNX7AkjkDzaMXVDjG/JOium90R23gVGMukzp9IamezUscAqAxVK+2C10k3tq8dZ/GeZfHl3NFGRHlIAXsJ/SIQoxJAEA0IQ/8Y50nR1Hp2mV2xsfxH9oZhLR/eiFdhJpNupdfw/oE9+vpCHS8SG88KGeLYbn+EhH6LSCD+6WNthF6oE7NANnScqn1Fl0ZpSd3RlRb+kDVKGqNxfB7EJTeimYvqaYmrTiTZTaTJua5Bj5yBTudqnBgdHCz3xMb2Nv2s2INNcJmP/CKpivYQ8AJs6cVlqRWnLJiNQQYCj+xAXBvY5T0Xq/qOhVifLiWZvZQOTHFWqFP9asZkrGa1mFWIaR9VPQY0FoYlUOT9t6J6TRbzktJIuP5AiOVoJLL6wjZuUMjghHfkYbqtyBqE4BbCY8YF3JSf8jx+9eWy+sD+dRwKXBCrGV0dNidioZR7ZJpBb6ye8wElebjPZizKhppsNpwtRxPfiAM52f55lXGD7IDpz9CZrOKUcV2uc3Rhl50u7T3psZfX7GysZvlnAH+Yr+UM+LPBAabXAfKlMnJp+SskLuOplTeQrvAwMluBmFnla8TnwnxQ== dmsimard@hostname
-    uid: 2028
-    gid: 2028
-
   frickler:
     comment: Jens Harbott
     key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmc5fbzMptjAb5D86zSH13ZYCbf3QuV1jk9hL0r1qHw frickler@os-infra-2017
@@ -173,7 +167,6 @@ base_users:
   - fungi
   - pabelanger
   - ianw
-  - dmsimard
   - frickler
 # Default empty list of users to install on specific hosts or groups
 extra_users: []
@@ -186,6 +179,7 @@ disabled_users:
   - yolanda
   - rcarrillocruz
   - shrews
+  - dmsimard
 
 iptables_snmp_v4_hosts:
   # cacti02.openstack.org