diff --git a/group_vars/all/ssh.yml b/group_vars/all/ssh.yml
index cd03b228a30969a1cd7f66523be086d52e95838c..dcb8b28f534dba64309705f4c966d52a53929471 100644
--- a/group_vars/all/ssh.yml
+++ b/group_vars/all/ssh.yml
@@ -7,22 +7,6 @@ people:
     keys:
       - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILF4SziV0jbp6DqnAaOx7/1dGDosmrWGa5TDCBxPV4sm
         comment: as@laquadrature.net
-  - user: Porkepix
-    editor: /usr/bin/vim
-    git_author_email: porkepix@laquadrature.net
-    git_author_name: Porkepix
-    keys:
-      - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTdxSd3nkuMFk4e+NeBu7LQ02qTmOWkzC+Sox8kO1vi
-        comment: Porkepix - old mac key
-      - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG+3QjfxK8abDDD7u5IQWUAqlz13jhpvfMlxgZDmwA31
-        comment: clement@T470-clement
-  - user: Snip
-    editor: /usr/bin/emacs
-    git_author_email: snip@kofuke.org
-    git_author_name: Snip
-    keys:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAqQE+eiSKoP5KQaqy627r+wDkW/iBLGXqnzRMYl/RkZjgGu0W+HAKIXWl3edK0QIpnOZyuVSLZ/BK+2mGACWVcyMQ3NUdvjDAvzMWYV4ASNO6PVNYxlJjIckwjDikNPbR2CztgV28hC1LN9MtBXrbn2bMdd5Dswyi53UxjarBD9ozmuGlvrEisUZPfcR3p+QrbeTnY7f7cEkPQckeqyOr5HtCJegoQh34y8TI1XD2si3+a5YYQIM/Jil0ndfQlApkDGCwd/xOgt5x3QGN3bufAbAAnYy1mq5BgUerwCSmwPLWyebMF2OjfwORiamRxCh9d5YZl84HpafQpOJFB3RWe/Z2Y+vdPiGUkkaOOQwjs2y3EZFcNe0F0Zfq2JnrEvQ+W8qCgGcG4W5eefiMyBhETRZetIgGiQM8dBkSsHgcBOu4liTGgsSePRxBjK50dzEw/27NEOQjYvgzojNdH96onM/7quIQc2wFi864WFqHDpkfbKd8D8oCHDKatMPGV0JAtJCtQ8I1WvH2Fsz/54TOAd/JI8rY55r8wV6pS2KsKX4xSoVmhUhJNT66QzLJUpuFz8Qt1KsY+s5+cDgo8gG4MnJWHrX1FHuGpisIcGJIrOmoBAwN3tEUxWyHWiGwaOMxi6xEvQ3nlAGTLhZq/yqaMRswQKBsnBrU0ijIVd8dCQ==
-        comment: snip@kofuke.org
   - user: Benjamin Sonntag
     editor: /usr/bin/emacs
     git_author_email: bs@laquadrature.net
@@ -30,17 +14,13 @@ people:
     keys:
       - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDLe9mJZfD2TxWHJjCzhRxHJg2rhJ86KYlnUVZ//5A8d32h1GcpFcCTLa7A+J2xdctov7UM5dNr4CMZAmDvPJcebPmmLTGR81cWAwmucTGdZVue4ycNDtteoV1+7Sx9MVbgAWGa4SS7C1IfsfPZJTWZBIGQEM/TYBjhAKdraJqK5aMTtyaXGCxsbwyK+0UzLgDXbfpM851S3MkksNiqNBu+8iyIWn6JgpU3vosfh3qdRS3VIXSXyUYE6+rAkHu+QkSyYmp7T2uzS3gsRFaRo6/76BPQF9ITA0IFjMvtytPV1IA8GiVnkdhZsyz7SdyIImC7YLAmOwdrN1kiTxGpskWJfXFSzYnXDa3t84i3sO9MR0Qf+QXJfHT60z02X//RCCPnT/Sy711HQKJ0sDrRXu+EfMtUlnCw2Q0OMehW07RHod2YImoFKzOHcjXkkl3Q8Us/5a/vosCKIOG+gbX5FEuAhjTy0n29enExN+W/1dPxUC7xDAEZx5NGG1GYcqt8bw1lzXtMuFrRsIQOxELou+EfXKSlWHhd6/xzoeNrUciw6hPI4gWt+wHPV0xl2x2HJnmXaB90TFBxBg/2vcOINBLxwcPZwM88BWmzNeDUCqMDnzD2XmbFYy9Jkc9Iu8OUDaj8ruGa9VgsuUGT5DOGncX+Py/vrv0cGsG39LwJuFSpgQ==
         comment: benjamin@mg
-  - user: Okhin
+  - user: Guinness
     editor: /usr/bin/vim
-    git_author_email: okhin@laquadrature.net
-    git_author_name: Okhin
+    git_author_email: oudin@crans.org
+    git_author_name: Rémi Oudin
     keys:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+Q/IeFY81C+C4XWNDjYEyr2ZoOJVJFSjlgYGwFO+fZqpOsuystaSjMRKpbsHyprwr4J4NL5HuTTpXR/PuV+09XdTee1F6olrAof7MXATPKow6Mbj3oXYeHTU92ZpSvosALoxYdPAh2oSWd/ZzcYP1tYKLwO4XlpPdahInaqddoqaS9yRicHvujYmOhqZ2HgI/C1HnCP1jqNoiDj96ZoBG/fQa9G29j1fALWbZnrBvq3MWCWJZmRbZI3vwVBZAAHTvnjsVSP6cpXKhMoV3USG9tXcZtTgZd+Ade4NiZBxkuaOpI66J3wgnjb0zGnzHi+p6B3VySzc0cyGJwpkKuRC3
-        comment: okhin@willow
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDe1uW/XfjZNYx3cmIoc1ZjRu5CrOrzpCZe0i3aH0e8RnueezQVEyXjhORMinDI4Dx3M096q3LGEi9U8D/MJfCrq7ev4sF/hw/MaU+YHyH7PFHKY30cFsXyN2QKzWVI6F6Bs3jC2wReNp0ofRGlzwuvK9n7/EhyCMH65dbVbfMH/CmWYsa/OuRCxaEM/ZYYWj/R5b616g4WAykvj+TUN8u/WERbGqly4MPToI1SGeuWx5rFK/VHLTTo0+mRi2fAZqA6HB2wKw9pJF0bEsdpH1nJVb912lGBgwUEebUxKLFg/jPjAgU2hayut/QlzSGOF+Oafm4UAFXpOTXKJAqWxZcd
-        comment: okhin@debianpi4
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+Q/IeFY81C+C4XWNDjYEyr2ZoOJVJFSjlgYGwFO+fZqpOsuystaSjMRKpbsHyprwr4J4NL5HuTTpXR/PuV+09XdTee1F6olrAof7MXATPKow6Mbj3oXYeHTU92ZpSvosALoxYdPAh2oSWd/ZzcYP1tYKLwO4XlpPdahInaqddoqaS9yRicHvujYmOhqZ2HgI/C1HnCP1jqNoiDj96ZoBG/fQa9G29j1fALWbZnrBvq3MWCWJZmRbZI3vwVBZAAHTvnjsVSP6cpXKhMoV3USG9tXcZtTgZd+Ade4NiZBxkuaOpI66J3wgnjb0zGnzHi+p6B3VySzc0cyGJwpkKuRC3
-        comment: okhin@tara
+      - key: ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAEQkcf9ULA7Fkaa9yTDuhqQZCD4kycfd0bjYESPBpvBZuHWiyUiiofpOsYcdWZQ+fuz1Hv1GGU5zFh367d5piRL2QFVvTk7pwH+iUrkxnMyF6f7n3Y1ZyrrUP41Xf8FmqSm1pfVjtNGuqkH7jNF+/jg3cSi642gs8aMkaG4tTrdt8ksxQ==
+        comment: remi@olaf
   - user: Mindiell
     editor: /usr/bin/vim
     git_author_email: tb@laquadrature.net
@@ -48,10 +28,12 @@ people:
     keys:
       - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCsEKH9T16VFIztigwiCWDEkgjW0F++NAHgh+MsiIPglcJ9VTmkw4nQDwbIS3cL4RMb6T30DAcxDG/k5YSh+KPC/G5xkmkS6/CVwCHBFvDByYDl6Dy0iGVExWE+I/ovnFOpoGRDMkGsyki5qXUcfDYW63fT2rPI6TgozAPrvLjIqoWSa686VcFtQGLP47xMhU3bPc1bchavyNAlSUKn6pXO07uab2ea327wMbkIU7JPj2IDuC08ZLgqE5EliRbvS7MUf4ewJXmHVahViCReAkboBvcfW9MVT22kifg+HikLU701PV2kCIfatL3/mcyI0G34yc1B7KSmS08CnKy9IzWW1SJdm6uM7zshtYFq0NmqamdV88btgh7aSxL8N73Kwk0thynTa1iX+QZpX49dH/kSRuwxUSeki172i1SHZT+9/cpymDumZDM4q9wZYZplHr69oJpcthToPaNPy8iFeNTNgOT+baPrY5qsigEsog4c/h9gkhr6M7wHzYJXoU7+eH+JF1xzZETSt/TlgQOzG4CDDWOrMfWH7VpbCIciKijdV5jnrT7/5AnVXBEInQD49xgxpjFHTq2hufdUUyuKydPN6x2c2J0r8XjiYFxLbGHsiNrmqh5WnsXc9ey3P5ztM81ODUs9WNTF8uX9MWMmWzSqgJFFLUCn1AWxd0esk6qNUQ==
         comment: tb@laquadrature.net
-  - user: Guinness
+  - user: Porkepix
     editor: /usr/bin/vim
-    git_author_email: oudin@crans.org
-    git_author_name: Rémi Oudin
+    git_author_email: porkepix@laquadrature.net
+    git_author_name: Porkepix
     keys:
-      - key: ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAEQkcf9ULA7Fkaa9yTDuhqQZCD4kycfd0bjYESPBpvBZuHWiyUiiofpOsYcdWZQ+fuz1Hv1GGU5zFh367d5piRL2QFVvTk7pwH+iUrkxnMyF6f7n3Y1ZyrrUP41Xf8FmqSm1pfVjtNGuqkH7jNF+/jg3cSi642gs8aMkaG4tTrdt8ksxQ==
-        comment: remi@olaf
+      - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTdxSd3nkuMFk4e+NeBu7LQ02qTmOWkzC+Sox8kO1vi
+        comment: Porkepix - old mac key
+      - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG+3QjfxK8abDDD7u5IQWUAqlz13jhpvfMlxgZDmwA31
+        comment: clement@T470-clement