diff --git a/roles/authorized-keys/vars/main.yml b/roles/authorized-keys/vars/main.yml
index c35f58b..6ee86f5 100644
--- a/roles/authorized-keys/vars/main.yml
+++ b/roles/authorized-keys/vars/main.yml
@@ -1,87 +1,87 @@
 admin_info:
   dfaure:
     name: David Faure
     email: faure@kde.org
     ssh_keys:
     - ssh-dss AAAAB3NzaC1kc3MAAACBAMJGSDFolRxUU9bqZQxqDXs8E8Z6Tc26EFGDhGwkhxHq2AzcTeYVxGFuL9j6ZpZePi9C+CsUrIHq9LAhEsX2H92Kegiaz+GzIfbGhefgClj4pJry4BE8Buyouyl+m6B7YvX8FAqKZOpNB85zL9GKDn9ypJ17neW4uS1ZYz8XNIcfAAAAFQDDHQ39s4SLxrfs/ubUzrXriTkA/QAAAIEAjgeatw8HIdD9ePExzGja+DxVvsX9Hze6nZhg4YSOyhAbkMXnSalyQEkf3skbH9c8XjTejYoaxYfiWvLXnVDu3pDVQIYY6Sll3VIuUickPEkw6stClOtw1lfDtoRjIsx4X7oTSpNiXWobsWsgxpXX8vWa7YUC7N457zMh8xYQZCQAAACAHdH1pVXrcWwO2mwFmBzinoECFDiA5x6rlsLoZpZLNEE3IQXXk/DKbdLZmpIbKGgwIaiGnn6JtQzEnYSim3XLX32tyQET0lvGJ/KUHgvS/sUFo+OwFbu1Pdd5bm03QJMCHaOZB4cgRGwRF5OOAYB9Fh0F8xOzJT7n4SDYIWVVuk4= dfaure@Asterix
     - ssh-dss AAAAB3NzaC1kc3MAAACBAOglLUecp5xbZPNJRN841NbH+uby7G3OL8Tn/PRzDR0NyneiFsLVwW4a19RKA5rs2SSJXbNn6TS/F484zzW0ApIHqeV3R1/h09joYhQcxWYa6lXtdJh3sjFd4GXOFji/eRBr6uKXXsWFK7GXsE8lDv77JAMyb6I6E+2nYsCjmrTPAAAAFQC3NTXlK00rb5ZiO+XMn2gIGmbwsQAAAIEA3wRzSDo4Ix9H+zUh8QTf5M5XpyDdtRMxXfAbF6ZH4ocVQQxFKj4EOC6ROxaQLxgtqTxCNvEE1YV+yhvOLbWAlSfb4fLM6/bLgLl44v4fzQ542VJfP21lnDgqWHEK9yBH1zCJ0GRDxhrp2ImbnBu9DBAyC6AUH8qOFT99RBnbsX4AAACAE6m0BFI4xifx3quqei2xpjL/J4CoBSOSbhWSA40BW4C++R2OpSYdRvuvInlCBaEm31sH7VdsHyLbJCdzvxcepLUCQgGoOj8Qu4S1JCngpA6uYJ35f4pNiQ8XvdPbIbKhR7rB3+qaAoO45t4x06enKlVBPsHwgZPYsbf9107WZE0= dfaure@cleo
     - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwuiY60IeNXleKCHe4Xox8zupNSJkeQ8uQAQ+crhuFfMBcwT3ym6cXZxOOy4a7v+Azs/MWH+DCyU+bmtbWqRfqSb4VjGVjyMh5hNRTCW5G19f243CKNQKU1hj5iINGvqvuSBvbk1aF9hH4M28s8C0OBj8sn0NVEO9kP1nO47/khuQI5I9zuckBv9VcDKulFwJnrLWLSX33GdA16d+TTfV0c21kRUU7q31yWyzqwSvblZ8Gi3M/DdzwmPoxrg83jhyN7V1vHOBfcE+7NL2O2QXmF+w9xnIWWzzP3hlZA1B8dS7m1Z+BEGvvDY2qn2hgS+rACiwbipjp99zi39fRzAVYQ== dfaure@kailin
 
   toma:
     name: Tom Albers
     email: toma@kde.org
     ssh_keys:
     - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAxwlNBd6dXpDFzhs5MjcKrGwCxDfYHUiduuXAYszIfwpnEb/noqVSlCeXN23tuevd+aKX5cm9ERKJToAuxSOOfIA7yXZNpJ9UrWTjwfLV4ZYhXPt73uuC5QRsM85ikea6JZUf7HK2ahHmYotbwIjM2aX5MWmUp1WoDHKVnK4eTsk= /home/toma/.ssh/id_rsa
 
   bcooksley:
     name: Ben Cooksley
     email: bcooksley@kde.org
     ssh_keys:
     - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVA3Twy1S/VDFodkB0gOhlbqcVScPXn4BTTo0gw7ivIPDofEv0RtGrqAhuYjtc+EtWPmIoYZXMJJ7kKThDLciFHAGc0vt6OjAacSFA2nckdautWidnsBRDhWDrYLTm5gcNWJwKFPAdB4y+Co6On/dh87EguaYSKqA3JKKzqveJ2ldSu8ELb/eUnNLFW+zHTU/SHYbpSxEpJwyn9rzSaERleFhIAb8Am4lgz42jNScb2bZ5RFzFdZm5wdTHkLWiZ/k39lX8uT7CqR7zR3mdLg7Pa4OoNlviMmuFCMhqfi/+0wUSraGmMWT80evh8a7BhQVXYZqOJNSyHji6IbveJ2m7 ben@Grace
 
   mitchell:
     name: Jeff Mitchell
     email: mitchell@kde.org
     ssh_keys:
     - ssh-rsa   AAAAB3NzaC1yc2EAAAABIwAAAIEAys9sP3eTiXSxr+QPANU3IhC2sF+bBN5XeJQIHABtrLTGarqaQc36Onqw0rekxGNIdILV2TBK8on0q637xD+aOEdHmIzy5zi1rZkSVuAW8QfWSgHUf0fmKVVWvayMwsmoTsrE6R6xKfkdk1/iS+tKGagnqDRSeRx3mC+dskdMdts=  mitchell@kde.org
 
   nalvarez:
     name: Nicolas Alvarez
-#    email: nicolas.alvarez@gmail.com
+    email: nalvarez@kde.org
     ssh_keys:
     - ssh-dss AAAAB3NzaC1kc3MAAACBAJL4IqDIPG4PkCaQCcR5smNUfe3sHAA7QPasScIeA6DvrfqJxPqtISXbnM6kT+qp5Bgcbl4u38DebQmnj/x+yevTyInYoRXNX/LRtiTRiShyE6yabtjLOTzQrKoq0uJPeUaLvgzdEt1NVCOHdha/r/ueE9Jp1FQptGB7S9+R7TUhAAAAFQDzZNyIFe05nAFa9tq/mWaGHGe5XQAAAIBiawZ+RVQUrRjICSzqb7p0dQLPaLVwb2Lz8/xWV9hzMAgs3Q+miWIm7OBdzSscpw1ZgMqADfhvGR6iH8yaIq/18K0OCyVVgvzqI+ZPKlDUJ+J70hIH6FScfu/taUxOF1TYA9V9XcMNwDnIEtayss9T3HTHF6k/qcZF7rSdFXximwAAAIBBuSGaEAU1hIJgus63ykvvUFN1xt69lPZtwufhUgJwL9AQ6YRjrWQoE0NQkbbwmAgkgjnVCZZYxPGDq3K3HRvcREEVG51Ob1YrKYqLKOKSZ/HNMRglZbTOimytO+tRZc+lqcta9fSYnYaWDIBObOaW2QJugTes5ZWYMUwU/GfK/g== nicolas@tahu
     - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDB0Z7qRGyQmXCZMf6xCTbY3T1ODrxn37E7kY6nXHQgBc7R/ElX0YQf+LL9D7PiFQ+Q0r+GYaw02hlJFkeyPtuvpFAlmduaW7L5s3nCQEAvKPujCjw+pUotYHGTXzkCPWxg8L/JcrZGCsQ7upkMGqr6QxiuAikYuBxc1rnB104JslB59UCo5riGL/7wgXeN9a8UyV3LOWLIUv1O9b/GqJlC6xP9X5vQyLQK96YZWkVkoDoO2BjGg1Dlpbzmwb/Yj0cysJXIYgLwn9CEBD7tHPMwcMhKzd6yYDyntlhGq6zyOQbpmt9N0dPqRTuRiBEX88XrkQbbIJMWroiVH2eXQvrd nicolas@ultratux
     - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0EAN9mJkauJlfvJQW7gIu5pknoQe3+3OuZheGil7evtMzs3hL43nP0nHW8vCXvCwGx5Gs02s2LwyKPX6uZ3BfmY59CBKIvb7FpW2NcImYelyJL90aY3q/8UKVLcTNgYjsbnKAXsRwnrpyJHzE9RM2Yd5mskPAE5JwGZ5+4fLc9N6ErMUMuaBVD7tcwlqxfCnqnXEzw3k10XgD/LJJdXpZV286ZL1Rq9nqDch7tCe0F/QpOQXvujt71IPN8o/eKefdEXgE8LTjR8s5XZ2Oclz7P7Tp9mL03FnVM5hBsEdykz0DM6MfFMXfQD/EC3gdoO3P4mGsulkThq/rbAYALlPsQ== Nicolas@NICOLAS-PC
 
   bshah:
     name: Bhushan Shah
     email: bshah@kde.org
     ssh_keys:
     - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6fkZmmxBBH+jhjhR86dVMKcA52g9XeiyWzLfjPDDSsxzH5LiaV4xnDM815uOgEn4tpiIvLjxopFfLjLt/jH/61VHmHZEeZtYuBgMjwJoZdrk6SbYdDIbZEKi2gZ1yE9pZtJXiX5z8GzLlm110jrjtWCM/gy0BqfUFAABI4RfGCnR1NZU+fqQ8f34AzIC2RgUEMsaRRyet+x7NosB11SaiKMxznCUq5/PO3IJ9QKi4SgX/8uSsySSN4rxSfriWY6fc5yzueFoFQcM9PwKdJl3QBlCb4Rym0ES9eKbYXA1BTLVHzufCFml1HNPaMTltEcH96Oke0oJKmdk+xGwPX2U1 bshah@kde
 
   kcoyle:
     name: Kenny Coyle
     email: kenny@heloo.net
     ssh_keys:
     - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvs+4xplGC5IKiSPkptWygIXw+OKg0DdnrZQOF4nEB/ZRwL/i8YaxFNeUH3suYL1uquxRoNacQQT4rzK/sdnlB6Itykjkuav59CQFrus7MvH8Ulq+gkwyTMEAmItDgPyl9XUzeLSTBA0onJ83l+DR5aMeMRGY6yYaxMfPhtt99Pkvi7ol9C9SB9u14Ue7T8HegPaK6j+R1ZYzto0deY5Wvu51myB9WfdbIWC7p8a1ySuoe0iYg/5Y+kPHzHEU7ebtNoIAGblFw/ky2pOLT0RpH6RaeiNEVfHz5FCgtmd8Krm8MnkYmGY0+r3tAXiRlc5PH53fFXNmIDVBD1085D1yqQ== kcoyle@kobol.geeksoc.org
 
   vollmer:
     name: Karl Vollmer
     ssh_keys:
     - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA9xAboFSnzWR4/1EmZ0ZUEsfR0pZkK7wSRBOZ7KBR4pMwVFiVtoY2xbZ4BgDCgmFIVqsi0/brL+BlzbY89+VnXLYzlXs3YpNaZjLGARgFbjX8eL2Fe+FKDxoJWx6+EeQmDhzmdVjbJHdbCsz5hI2InlQBcoLcQ5g3NitNT1nhZQwjkh4bkQReoN648lJWf3APThNPcOIR8bNxJminDCt9AjIsETXNGpT567InvkRk+d44yu0qY7ZbseeTPxN+5XbJ3Wsn5fmIG0ty0EsFiA4MJzq+Vrb/IYHHPSUhhBCLMAZ7yiSIoDDMcPKqfUsbPBeOwfxvjSjFgYF3H/nk+gfP7w== vollmerk@kvollmer.UCIS.Dal.Ca
 
   osuosl:
     name: OSUOSL Sysadmin
     ssh_keys:
     - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDnBjOARXUzKUzYmdYe2UdpUhoZgG2YeqS2mQF/YgNx7gJJbLn/v8GjV5efDGl0Ad2rW6CO30keN92V6U4oBs2W0+tFNyFScd8NYLPW+ijz7wtAuE4Vf2yJCXa8zFZzi2nTayIekufYsZvk55GhFUav1NFAh7EeQjBnFLck7wlnA6ENCYxIHFFtRRTYv3LCHdvfUtWuKbDim1UWxHufQj1q8ay732nV6RTzVwH4PDDCJjsgxMDcZqfRcRrQE3n98Bzkb/TAG22G3E2KOa+RTtwxRjaMs/ZKA9lV3MjeLUk8SQW9h64hiZB1tl5njVfhC6shtdgKZy/JUiV97IF+2NbBC2LQ/AsGgYUGkPwwR8SiFhzxy5lqrQo9eXVLs6NuM6Q9GdRfOhigxw9ukQPYu29z4Uq4EaWQgtszXmy5hwkPKA1gIEj6ZpYl2y481wGEdXBoK9m1avs0EVlhQ5pXKv1XAn2icqGsaiajSyqNeYRH87q25I+VKJcPCSW7uVDWm+sTFUWe++5hAcHym0QAzmCYwAqYBwdCZl8oepZUA7Szalqxu9Vdka/IjoKiTDJjWf8NWAMs8v6sOvymdzZD4+I3JFkPOrtG3m+Ex6dRB1BQ63Hzmjx+BuiUU95/YsYq5CwGOjkkr+O29HwOBnxfnDqakKULh9H/28Zftco2qUphLQ== osuosl unmanaged
 
   apol:
     name: Aleix Pol
     email: apol@kde.org
     ssh_keys:
     - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYrbq1VrmuHzvKd4Sh1dUMTR2ouKqk65V7zlWvZC8kbtrSjqZQA9HcAE3TQoLuaUXfaT7V+j2tV14OdH/Pc/z5EeqolrWmWF5dgoASY/AIzA5g7uB88KYE+I2ue/k4r3qLgzVAN60+qp2Hw8EqJ1RFKqq41Q4JMSkqVdsHFW5ioPFUajMLIKIlByA/ZlpTKu0ND3kQxZza58QeodUmLCP4xHn7/tIHKij7D6yfRDGwJukcnvCN5gTe+OVhso3vfsJpg4OcHXCW/+i8/tJaF9eecS8IOWq02alX6oBvh93v5/8WKCQpqNL0oiqthczsp15HLkW152OXSXQ71e8WvN0R apol@oliver
 
   ruben:
     name: Rubén Rodríguez # FSF Senior System Administrator since 2015-08-11
     email: ruben@gnu.org
     ssh_keys:
     - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDUzCPvgIwIsQBytrfLFZE8KzcI/6cwfaq5cVFm9Ii44OxYyXIyJRfAsYkcF6dh8AefmPWFtkMAiOjCKgfKWvq7yx/UDtqcZZkOcAY1YCr4rvWurNHB4PLgI3goVPrd5dYXrapX24HUy4ur2BqeekPFfZFVvL0tBABbKFXJJiy1xS/3YN2ixV67vd2VCVAtr4UKRo6iiZXa+dSMxF5EZk0b53CXCjWTgPiuYsW58iSbwQTrX/Bdql6d8Vyv+KOpRqIbC0JhQCjAU2xaT5HQ1q+6eSGsWJw8iXrn6BDKNwcVX9afMJPVRZzA/59wZR4n1OgiqVHWM7yglGRgZKo8UD2Y9ChYhLpmHa+fslIj3pSdPvoK6ifuXGPR3Y5M2ubfDos6ogVTf9FiiBLpL/g534FDUJH6lRfFrOhEp56Judo4vY3m77QljWL5ZvsY+VLEyAnAWYhM5NYWQJgd2l0JCJbrTNyCGudYkBsatEHmwgpYceRapeANl2tuDWxTF0KXxXjRPvEq/w+I0AqVbnatT1QcDTHRscHDVrS+4Jl8WqSJKEeEnGZ97GAKfm/l5TnnX/053TXf+BhgEQfbLiSZK0MOyXM0d1MiBIsNLuVCKG+elCLLxFkuoGcKQ7hP1vmK/z1XsOMJ0ZEi5RfaUTPve/tkYuO2OiBWN6yL3BnqNC2tGw== ruben@deskstation
 
   aacid:
     name: Albert Astals Cid
     email: aacid@kde.org
     ssh_keys:
     - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyfw8DRnUejFZ8C6vHodo5y00sxr6TbRCXsKzgtKfbkTesMnI6H/vWVO8g1qUn2ae0i/T8NR7dC9DbzDP7NBbpIpo+gVIvgK7YRwmfBzqxfcX1rWyDlj+DaX20otEKk67Xs0sNtXor2c9XaFZnP+3CP3eZLIrqhT5NOSTXyTHgliw1sNWnwUUXWdL73SmzIG4Nlsuhi22fuZ5mYNc6NRyg2kLlQKAk8oPYfJPiFYDWZ3DYWKr/1rzRzWP7419qfhvvY5YTsSP4sRk49j9VoOaIgG3J9o2habqmRWY+dqWneEW0yKwN+h1dYPxn+lPPNes99HqetTF7Jd/g94q46NuCQ== tsdgeos@bluebox
 
   ltoscano:
     name: Luigi Toscano
     email: luigi.toscano@tiscali.it
     ssh_keys:
     - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCxFBHZA2qaN4TjY5BLmFh7zXnGwjFGJ28XCNV8GBZ8UGoSalmR9wjcPRS4kUz8Tes2yWR5OfSyL4i82nhda3RSb7EpeUsiwTPcyM7bNlKckpcAsuTfQywXz6nRieY0ou7O3r+1ZHHSUYTwsadtwuwczAqlM3dPL0BybLHSsFb5ORJAEKeoVTPtSsR+5GcZ0MYeR8rdgVTIKy/MFidlHeF1G6ZKJr7P5scj291n7lifXIbyMqDdDG8HlWIdMmNyyIwnRZZvbCyDfavbxDwx/8KoEntqgQpo2W5BiyoDsqCjjn1Ls5ri28HGJpNzjvl2nwNy9dCdBU1r+1rvLctBT847OG5j+ozRgmLzA/NDv8lvWfivJZdYrtE/cMlnbNx1dti1iQd+4ZjqAOuvz50K8Fni0DZcj1J2/28cpIKVtPFiJ8JdVwX9hziADj0O87LkjqpRhed4wuFba6DpaQFb7NVfCw4B1TnWbr/msT1odQHw3qoPib4Vi9ME3/IfcrYj1WMwVfmIMt80fUOG5ZYxd4DS0Kvvu7ZiNTTjK6dDmTHoBdkhJJE6wMHzCXGW19nfJiq6Um+PADrDy1cTEm/EkNlkRgsDXRSUoC6jt9U0i/yjEPKZOW5FWcBY/01PVMIpeI8nXRPAfzZI0G1jkApDdHZuKYvSrH8UsclWAH3jO1Y0uQ== luigi@telemaco
     - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+JBHqb4rxZSC4iM6oIGPtQzuzAUQJkss7tAKNmaXLwtqkbqeyBFdfJz+ImGzywcxifZEfjMIPgdmxNxpvan+C3vRZURDWOF0C/Li2VjY4RsBg8w8mciqowlxbWFtUMXVVT3tMO1Cby00xsASMV/BZWENTr7d9yNXBw6VDXy4H8Eq/BhCS4P39usHyH4Y35f5hOXvM2sS3Vt2p2WPv8NkIrZ0cY4/uTbBIEVE8PhPUGHCsQ4KUzpcGmvQvjOGUP3s3OvV3P48PRS/tZ2jwctyN90RslRp6KUmWzmqLJcjDslf5F7jjMspiQe0hWLe40u63sGjS3kPZqJk6tH2Ya1bz toscano@whitebase.usersys.redhat.com
 
   lueck:
     name: Burkhard Lück
     email: lueck@hube-lueck.de
     ssh_keys:
     - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxyo48ZVODn8FLEBueuWqYoHYiz6jjtmOh5fsQIDAXcnoDBmgV9Gb0HIGC17RJ6LUG641Vg0wVXKX+ya/ISYUmuuElqWoI7/ob5cZWQ4dR2+eT282z+Lr3rsq+1rWAk0T7L3zU+danl8supOSkWnFhlMI0LOwAuXT7UL/lXJzUrpRLwVz2CSWQK6YdIwdRwn5JRJ4C6B109mc4q9QZfRI6LaNkIrDF9cR8R88tjiNJb9nXLmFXCFAnnjkc+Nu831w+F1Vr8Uw7tILHio5Mh8X/iqgKuH+sLsKo5dGkw9VTJ0fuK8azRtu9hA4ttCVwvYaIvJPHHX6YXVToY2QrRtMB bb@tuxedo