diff --git a/docs/machine/contacts.md b/docs/machine/contacts.md
index d5b1d0b..f3f3edb 100644
--- a/docs/machine/contacts.md
+++ b/docs/machine/contacts.md
@@ -29,6 +29,11 @@ hide:
 | System Responsible    | {{Cigdem}}                   |
 | Controls Expert       | {{Arturo}}                   |
 | Camera Expert         | {{Helge}}                    |
+| Screen Panel Expert   | {{AlexG}}                    |
+| Electronics Expert    | {{Daniel}}                   |
+| Electronics Expert    | {{Matteo}}                   |
+| Firmware Expert       | {{Daniele}}                  |
+| Firmware Expert       | {{Benoit}}                   |
 | **Vacuum**                                           |
 | System Responsible    | {{Romain}}                   |
 | System Expert         | {{Natalia}}                  |
@@ -41,6 +46,7 @@ hide:
 | System Expert         | {{Fabio}}                    |
 | System Expert         | {{Juergen}}                  |
 | System Expert         | {{Dani}}                     |
+| Controls Expert       | {{Renata}}                   |
 | **RF Booster / Ring**                                |
 | System Responsible    | {{Lukas}}                    |
 | **RF 3HC**                                           |
@@ -56,4 +62,5 @@ hide:
 | System Responsible    | {{Boris}}                    |
 | System Expert         | {{Pedro}}                    |
 | System Expert         | {{Goran}}                    |
+| Firmware Expert       | {{JonasP}}                   |
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 105af22..fb69f04 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -64,8 +64,10 @@ extra:
     # People Machine
     Alessandro : '[Alessandro](https://intranet.psi.ch/de/people/alessandro-citterio "Alessandro Citterio"){:target="_blank"}'
     Alex : '[Alex](https://intranet.psi.ch/de/people/alexander-dietrich "Alexander Dietrich"){:target="_blank"}'
+    AlexG : '[Alex](https://intranet.psi.ch/de/people/alexandre-gobbo "Alexandre Gobbo"){:target="_blank"}'
     Andrin : '[Andrin](https://intranet.psi.ch/de/people/andrin-fazan "Andrin Fazan"){:target="_blank"}'
     Arturo : '[Arturo](https://intranet.psi.ch/de/suche/telefonbuch-und-e-mail "Arturo Daniel Alarcon"){:target="_blank"}'
+    Benoit : '[Benoit](https://intranet.psi.ch/de/people/benoit-stef "Benoit Stef"){:target="_blank"}'
     Boris : '[Boris](https://intranet.psi.ch/de/people/boris-keil "Boris Keil"){:target="_blank"}'
     Carl : '[Carl](https://intranet.psi.ch/de/people/carl-beard "Carl Beard"){:target="_blank"}'
     Chris : '[Chris](https://intranet.psi.ch/de/people/christopher-h-gough "Christopher H. Gough"){:target="_blank"}'
@@ -75,6 +77,7 @@ extra:
     Dani : '[Dani](https://intranet.psi.ch/de/people/daniel-kunz "Daniel Kunz"){:target="_blank"}'
     Daniel : '[Daniel](https://intranet.psi.ch/de/people/daniel-marco-treyer "Daniel Marco Treyer"){:target="_blank"}'
     DanielD : '[Daniel](https://intranet.psi.ch/de/aie/people/daniel-deak "Daniel Deak"){:target="_blank"}'
+    Daniele : '[Daniele](https://intranet.psi.ch/de/people/daniele-felici "Daniele Felici"){:target="_blank"}'
     Dragutin : '[Dragutin](https://intranet.psi.ch/de/people/dragutin-maier-manojlovic "Dragutin Maier-Manojlovic"){:target="_blank"}'
     Elmar : '[Elmar](https://intranet.psi.ch/de/people/elmar-zehnder "Elmar Zehnder"){:target="_blank"}'
     Fabio : '[Fabio](https://intranet.psi.ch/de/people/fabio-marcellini "Fabio Marcellini"){:target="_blank"}'
@@ -101,6 +104,7 @@ extra:
     Martin :  '[Martin](https://intranet.psi.ch/de/people/martin-paraliev "Martin Paraliev"){:target="_blank"}'
     MartinG :  '[Martin](https://intranet.psi.ch/de/people/martin-gasche "Martin Gasche"){:target="_blank"}'
     Masamitsu :  '[Masamitsu](https://intranet.psi.ch/de/people/masamitsu-aiba "Masamitsu Aiba"){:target="_blank"}'
+    Matteo :  '[Matteo](https://intranet.psi.ch/de/people/matteo-pera "Matteo Pera"){:target="_blank"}'
     Michael : '[Michael](https://intranet.psi.ch/de/people/michael-boege "Michael Böge"){:target="_blank"}'
     Micha : '[Micha](https://intranet.psi.ch/de/people/micha-dehler "Micha Dehler"){:target="_blank"}'
     Natalia : '[Natalia](https://intranet.psi.ch/de/people/natalia-magdalena-kirchgeorg-0 "Natalia Magdalena Kirchgeorg"){:target="_blank"}'
@@ -111,6 +115,7 @@ extra:
     Radoslaw : '[Radoslaw](https://intranet.psi.ch/de/people/radoslaw-rybaniec "Radoslaw Rybaniec"){:target="_blank"}'
     Rebecca : '[Rebecca](https://intranet.psi.ch/de/people/rebecca-gattringer "Rebecca Gattringer"){:target="_blank"}'
     Reno : '[Reno](https://intranet.psi.ch/de/people/nazareno-gaiffi "Nazareno Gaiffi"){:target="_blank"}'
+    Renata : '[Renata](https://intranet.psi.ch/de/people/renata-krempaska "Renata Krempaska"){:target="_blank"}'
     Roger : '[Roger](https://intranet.psi.ch/de/people/roger-kalt "Roger Kalt"){:target="_blank"}'
     Romain : '[Romain](https://intranet.psi.ch/en/people/romain-ludovic-vallotton "Romain Ludovic Vallotton"){:target="_blank"}'
     RomainG : '[Romain](https://intranet.psi.ch/de/people/romain-ganter "Romain Ganter"){:target="_blank"}'