diff --git a/_data/hifis_team.yml b/_data/hifis_team.yml
index 5c67327ccbbb6558c9208aa48ef8afbdec3a3cae..2533965d14abae755c92068ec3f126d56880ba73 100644
--- a/_data/hifis_team.yml
+++ b/_data/hifis_team.yml
@@ -30,7 +30,45 @@
 #       - type:     facebook    # c.f. _data/social_platforms.yml
 #         link_as:  https://www.facebook.com/my-profile-url
 #         show_as:  "My Profile"
-
+- id: belayneh
+  name: "Belayneh, Bezaye Tesfaye"
+  location:
+    campus: gfz
+  position: "Research Software Engineer"
+  rank: 0
+  associate: false
+  cluster: software
+- id: brinckmann
+  name: "Brinckmann, Nils"
+  location:
+    campus: gfz
+  position: "Full Stack Developer"
+  rank: 0
+  associate: true
+- id: dolling
+  name: "Dolling, Maximilian"
+  location:
+    campus: gfz
+  position: "Research Software Engineer (RSE)"
+  rank: 0
+  associate: false
+  cluster: software
+- id: dworatzyk
+  name: "Dworatzyk, Katharina"
+  location:
+    campus: dlr
+  position: "Research Assistant"
+  rank: 0
+  associate: false
+  cluster: software
+- id: erxleben
+  name: "Erxleben, Fredo"
+  location:
+    campus: hzdr
+  position: "Research Software Engineer and Trainer"
+  rank: 0
+  associate: false
+  cluster: software
 - id: guelzow
   name: "Guelzow, Volker"
   image: "Volker_Guelzow.jpg"
@@ -39,8 +77,15 @@
   position: "Coordinator and Speaker of HIFIS"
   associate: false
   rank: 4
-  associate: false
   cluster: overall
+- id: hueser
+  name: "Hüser, Christian"
+  location:
+    campus: hzdr
+  position: "Research Software Engineer and Trainer"
+  rank: 0         
+  associate: false
+  cluster: software
 - id: finke
   name: "Finke, Ants"
   image: "Ants_Finke.jpg"
@@ -49,7 +94,6 @@
   position: "Coordinator"
   associate: false
   rank: 3
-  associate: false
   cluster: overall
 - id: konrad
   name: "Konrad, Uwe"
@@ -59,7 +103,6 @@
   position: "Coordinator"
   associate: false
   rank: 3
-  associate: false
   cluster: overall
 - id: jandt
   name: "Jandt, Uwe"
@@ -69,7 +112,6 @@
   position: "HIFIS Office Management"
   associate: false
   rank: 2
-  associate: false
   cluster: overall
 - id: fuhrmann
   name: "Fuhrmann, Patrick"
@@ -79,7 +121,6 @@
   position: "Backbone Cluster Management"
   associate: false
   rank: 1
-  associate: false
   cluster: backbone
 - id: klotz
   name: "Klotz, Andreas"
@@ -89,7 +130,6 @@
   position: "Cloud Cluster Management"
   associate: false
   rank: 1
-  associate: false
   cluster: cloud
 - id: spicker
   name: "Spicker, Annette"
@@ -99,7 +139,6 @@
   position: "Cloud Cluster Management"
   associate: false
   rank: 1
-  associate: false
   cluster: cloud
 - id: huste
   name: "Huste, Tobias"
@@ -109,6 +148,21 @@
   position: "Software Cluster Management"
   associate: false
   rank: 1
+  cluster: software
+- id: schlauch
+  name: "Schlauch, Tobias"
+  location:
+    campus: dlr
+  position: "Research Software Engineer"
+  rank: 0
+  associate: false
+  cluster: software
+- id: stoffers
+  name: "Stoffers, Martin"
+  location:
+    campus: dlr
+  position: "Consultant and Trainer"
+  rank: 0
   associate: false
   cluster: software
 - id: wetzel
@@ -118,5 +172,12 @@
   position: "HIFIS Backbone Services"
   associate: false
   rank: 0
-  associate: false
   cluster: backbone
+- id: ziegner
+  name: "Ziegner, Norman"
+  location:
+    campus: ufz
+  position: "Linux System Engineer"
+  rank: 0
+  associate: false
+  cluster: software
diff --git a/_events/2019/2019-12-11-snakemake-introduction-workshop.md b/_events/2019/2019-12-11-snakemake-introduction-workshop.md
index 2b22f5935beeda3ef8f09ac5aaaac91409eb7097..3a850c1bda980ba964be724dc96f6e6ee0bf97ec 100644
--- a/_events/2019/2019-12-11-snakemake-introduction-workshop.md
+++ b/_events/2019/2019-12-11-snakemake-introduction-workshop.md
@@ -2,9 +2,9 @@
 title: Introduction to Snakemake
 layout: event
 organizers:
-  - steinbach
+  - Steinbach, Peter
 lecturers:
-  - steinbach
+  - Steinbach, Peter
 type:   workshop
 start:
     date:   "2019-12-11"
diff --git a/_events/2020/2020-03-31-the-carpentries-workshop.md b/_events/2020/2020-03-31-the-carpentries-workshop.md
index 0c02f66389f20c7a319eccc117a50c406bec7a78..e6691ca06cc65301dde2e75d76cdd10b1199ea1e 100644
--- a/_events/2020/2020-03-31-the-carpentries-workshop.md
+++ b/_events/2020/2020-03-31-the-carpentries-workshop.md
@@ -7,7 +7,7 @@ organizers:
 lecturers:
   - erxleben
   - huste
-  - steinbach
+  - Steinbach, Peter
 type:   workshop
 start:
     date:   "2020-03-31"
diff --git a/_events/2020/2020-04-21-the-carpentries-workshop.md b/_events/2020/2020-04-21-the-carpentries-workshop.md
index 278c2c8195ade5aef97c5dc80c1473fe4a70f449..547c0d22a96b9aa44139e081a7587442dd6bfa36 100644
--- a/_events/2020/2020-04-21-the-carpentries-workshop.md
+++ b/_events/2020/2020-04-21-the-carpentries-workshop.md
@@ -7,7 +7,7 @@ organizers:
 lecturers:
   - erxleben
   - huste
-  - steinbach
+  - Steinbach, Peter
 type:   workshop
 start:
     date:   "2020-04-22"
diff --git a/_events/2020/2020-05-12-ready-script-for-publication.md b/_events/2020/2020-05-12-ready-script-for-publication.md
index 55b968ea2fc16af76646ad30da209d60aa194d8d..1d27dd7f681636a7f5ed0f6d60c9fbd579a3ff74 100644
--- a/_events/2020/2020-05-12-ready-script-for-publication.md
+++ b/_events/2020/2020-05-12-ready-script-for-publication.md
@@ -11,7 +11,7 @@ organizers:
 lecturers:
   - schlauch
   - dolling 
-  - leinweber
+  - Leinweber, Katrin
   - huste
 
 start:
diff --git a/_events/2020/2020-06-09-GitLab-Software-Development-Teams.md b/_events/2020/2020-06-09-GitLab-Software-Development-Teams.md
index 368e2d75af55d2539d2fe2db6f1b214f19ca2647..ff85039b2b39d462248de6c01c7cc743fb303996 100644
--- a/_events/2020/2020-06-09-GitLab-Software-Development-Teams.md
+++ b/_events/2020/2020-06-09-GitLab-Software-Development-Teams.md
@@ -6,7 +6,7 @@ organizers:
 lecturers:
   - schlauch
   - "1 × HZDR"
-  - leinweber
+  - Leinweber, Katrin
 type:   workshop
 start:
     date:   "2020-06-09"
diff --git a/_events/2020/2020-09-18-git-and-gitlab.md b/_events/2020/2020-09-18-git-and-gitlab.md
index 9a6be54b1830bdc8349784b33c0b1a9164c0ec11..d0e97e95be9af166c5ba0f1a9b82125d6e6dea1d 100644
--- a/_events/2020/2020-09-18-git-and-gitlab.md
+++ b/_events/2020/2020-09-18-git-and-gitlab.md
@@ -6,7 +6,7 @@ organizers:
 lecturers:
   - erxleben
   - lokamani
-  - schmerler
+  - Schmerler, Steve
 type:   workshop
 start:
     date:   "2020-09-18"
diff --git a/_events/2020/2020-10-07-the-carpentries-workshop.md b/_events/2020/2020-10-07-the-carpentries-workshop.md
index a53701c8b56ab03393f89b2c8b68853042a9dab9..522d880989b4df881021435c405b602cf2c2cf4b 100644
--- a/_events/2020/2020-10-07-the-carpentries-workshop.md
+++ b/_events/2020/2020-10-07-the-carpentries-workshop.md
@@ -4,8 +4,8 @@ layout: event
 organizers:
   - erxleben
 lecturers:
-  - steinbach
-  - schmerler
+  - Steinbach, Peter
+  - Schmerler, Steve
   - erxleben
   - hueser
 type:   workshop
diff --git a/_events/2020/2020-11-23-Git-with-GitLab-for-Teams-and-Reproducible-Research.md b/_events/2020/2020-11-23-Git-with-GitLab-for-Teams-and-Reproducible-Research.md
index 378710c8b862b22e03d86b1336e187d3ad9c4b65..c049da699d060184fba1335d1828c11c75f0f174 100644
--- a/_events/2020/2020-11-23-Git-with-GitLab-for-Teams-and-Reproducible-Research.md
+++ b/_events/2020/2020-11-23-Git-with-GitLab-for-Teams-and-Reproducible-Research.md
@@ -3,14 +3,14 @@ title: Git with GitLab for Teams and Reproducible Research
 layout: event
 organizers:
   - belayneh
-  - "Julia Neelmeijer"
+  - "Neelmeijer, Julia"
 lecturers:
   - belayneh
   - dolling
-  - "Hannes Fuchs"
-  - "Stefan Lüdtke"
-  - "Christian Meeßen"
-  - "Marc Hanisch"
+  - "Fuchs, Hannes"
+  - "Lüdtke, Stefan"
+  - "Meeßen, Christian"
+  - "Hanisch, Marc"
   - brinckmann
 type:   Workshop
 start:
diff --git a/_events/2021/02/2021-02-24-Version-Control-using-Git.md b/_events/2021/02/2021-02-24-Version-Control-using-Git.md
index a70df20d7651517e10f7798e4034586ebba246aa..6607539ff5e3177236fd04b312623aab046e06f2 100644
--- a/_events/2021/02/2021-02-24-Version-Control-using-Git.md
+++ b/_events/2021/02/2021-02-24-Version-Control-using-Git.md
@@ -6,9 +6,9 @@ organizers:
 lecturers: 
   - belayneh
   - dolling
-  - "Hannes Fuchs"
-  - "Stefan Lüdtke"
-  - "Christian Meeßen"
+  - "Fuchs, Hannes"
+  - "Lüdtke, Stefan"
+  - "Meeßen, Christian"
 type:   workshop
 start:
     date:   "2021-02-24"
diff --git a/_events/2021/03/2021-03-19-git-and-gitlab.md b/_events/2021/03/2021-03-19-git-and-gitlab.md
index ff1618dc96392f88178f7a3d7dbce04e388e3967..8f316800b2fba3f2ce3673c48df14cd2e5d54d19 100644
--- a/_events/2021/03/2021-03-19-git-and-gitlab.md
+++ b/_events/2021/03/2021-03-19-git-and-gitlab.md
@@ -4,8 +4,8 @@ layout: event
 organizers:
   - erxleben
 lecturers:
-  - Helene Hoffmann
-  - schmerler
+  - Hoffmann, Helene
+  - Schmerler, Steve
 type:   workshop
 start:
     date:   "2021-03-19"
diff --git a/_events/2021/03/2021-03-25-version-control-using-git.md b/_events/2021/03/2021-03-25-version-control-using-git.md
index 1de1e0170006662b153b77f7c108e6efbc435489..55b6e9dde28fca7ba6c6c60c5a698ab962e5cde0 100644
--- a/_events/2021/03/2021-03-25-version-control-using-git.md
+++ b/_events/2021/03/2021-03-25-version-control-using-git.md
@@ -6,9 +6,9 @@ organizers:
 lecturers: 
   - belayneh
   - dolling
-  - "Hannes Fuchs"
-  - "Stefan Lüdtke"
-  - "Christian Meeßen"
+  - "Fuchs, Hannes"
+  - "Lüdtke, Stefan"
+  - "Meeßen, Christian"
 type:   workshop
 start:
     date:   "2021-03-25"
diff --git a/_events/2021/04/2021-04-27-python.md b/_events/2021/04/2021-04-27-python.md
index 49f294645a927fc51fafabaf21452bd070fb6b33..ca6def8acd34bba0c41ec21ef89884b1fba461da 100644
--- a/_events/2021/04/2021-04-27-python.md
+++ b/_events/2021/04/2021-04-27-python.md
@@ -6,10 +6,10 @@ organizers:
 lecturers: 
   - belayneh
   - dolling
-  - "Hannes Fuchs"
-  - "Stefan Lüdtke"
-  - "Christian Meeßen"
-  - "Nils Brinkmann"
+  - "Fuchs, Hannes"
+  - "Lüdtke, Stefan"
+  - "Meeßen, Christian"
+  - "Brinkmann, Nils"
 type:   workshop
 start:
     date:   "2021-04-27"
diff --git a/_events/2021/05/2021-05-26-code-publication.md b/_events/2021/05/2021-05-26-code-publication.md
index d85f50b4affb5de514650e890d79cafbffff4c6b..1fdc5fd31f4b888ec2c6505ec2756aa28a8a027b 100644
--- a/_events/2021/05/2021-05-26-code-publication.md
+++ b/_events/2021/05/2021-05-26-code-publication.md
@@ -4,13 +4,13 @@ layout: event
 organizers:
   - belayneh
   - dworatzyk
-  - "Johannes Petereit"
+  - "Petereit, Johannes"
 lecturers:
   - belayneh
   - dolling
   - schlauch
-  - "Christian Meeßen"
-  - "Stefan Lüdtke"
+  - "Meeßen, Christian"
+  - "Lüdtke, Stefan"
 type:   Workshop
 start:
     date:   "2021-05-26"
diff --git a/_events/2021/07/2021-07-26-version-control-using-git.md b/_events/2021/07/2021-07-26-version-control-using-git.md
index 1c319316bf253bbb3e2afae43a7ebb6639e834e8..873f50b6123fd1b611273b59977f68ab41ecfe48 100644
--- a/_events/2021/07/2021-07-26-version-control-using-git.md
+++ b/_events/2021/07/2021-07-26-version-control-using-git.md
@@ -6,9 +6,9 @@ organizers:
 lecturers: 
   - belayneh
   - dolling
-  - "Hannes Fuchs"
-  - "Stefan Lüdtke"
-  - "Christian Meeßen"
+  - "Fuchs, Hannes"
+  - "Lüdtke, Stefan"
+  - "Meeßen, Christian"
 type:   workshop
 start:
     date:   "2021-07-26"
diff --git a/_posts/2019/12/2019-12-20-Welcome-Post.md b/_posts/2019/12/2019-12-20-Welcome-Post.md
index 4ab40e206c9e5c3b4353de2e88d85f694a4064c5..fdba179ca67e1c1b55a3c39321a14fbc1409bd32 100644
--- a/_posts/2019/12/2019-12-20-Welcome-Post.md
+++ b/_posts/2019/12/2019-12-20-Welcome-Post.md
@@ -3,7 +3,7 @@ title: Welcome to HIFIS Software
 date: 2019-12-20
 authors:
   - huste
-  - leinweber
+  - Leinweber, Katrin
 layout: blogpost
 title_image: photo-of-open-signage-2763246.jpg
 excerpt:
diff --git a/_posts/2020/02/2020-02-21-HIFIS-workshops-2020.md b/_posts/2020/02/2020-02-21-HIFIS-workshops-2020.md
index a8a161fd78a6a11dbb013ed9637c6ab3e2883d75..9fd79c05be4194aa72a5a328e193c3c18c99f04d 100644
--- a/_posts/2020/02/2020-02-21-HIFIS-workshops-2020.md
+++ b/_posts/2020/02/2020-02-21-HIFIS-workshops-2020.md
@@ -2,7 +2,7 @@
 title: Overview of HIFIS Workshops in 2020
 date: 2020-02-21
 authors:
-  - leinweber
+  - Leinweber, Katrin
 layout: blogpost
 title_image: default
 categories:
diff --git a/_posts/2020/04/2020-04-17-online-swc-at-hzdr.md b/_posts/2020/04/2020-04-17-online-swc-at-hzdr.md
index 6cecc4ee2b11a060f6a7456da33f58d695d9f4bd..2c1e82e172fe15458d8d8ff50ef19709cfb0e891 100644
--- a/_posts/2020/04/2020-04-17-online-swc-at-hzdr.md
+++ b/_posts/2020/04/2020-04-17-online-swc-at-hzdr.md
@@ -297,7 +297,7 @@ which to build our future events.
 
 ## Acknowledgements
 
-{% assign instructors="steinbach / huste / erxleben" | split: " / "%}
+{% assign instructors="Steinbach, Peter / huste / erxleben" | split: " / "%}
 {% assign helpers="Lokamani / hueser" | split: " / "%}
 
 We want to thank our **instructors**
diff --git a/_posts/2020/08/2020-08-19-introducing-consulting.md b/_posts/2020/08/2020-08-19-introducing-consulting.md
index 12141643843e12cd8ca95ca6bb44e0c760646dd4..69d8686067990e5b13070aa69e8b5185c285fa14 100644
--- a/_posts/2020/08/2020-08-19-introducing-consulting.md
+++ b/_posts/2020/08/2020-08-19-introducing-consulting.md
@@ -2,7 +2,7 @@
 title: "Introducing: Consulting Services"
 date: 2020-08-19
 authors:
-  - frere
+  - Frere, Jonathan
 layout: blogpost
 title_image: headway-5QgIuuBxKwM-unsplash.jpg
 categories:
diff --git a/_posts/2020/09/2020-09-23-getting-started-with-docker-1.md b/_posts/2020/09/2020-09-23-getting-started-with-docker-1.md
index 2e94ed8d0649d6af4159f88480fde63546c71d83..94679054879d5035a25e342ca2ce55e5962a0144 100644
--- a/_posts/2020/09/2020-09-23-getting-started-with-docker-1.md
+++ b/_posts/2020/09/2020-09-23-getting-started-with-docker-1.md
@@ -2,7 +2,7 @@
 title: "Docker For Science (Part 1)"
 date: 2020-09-23
 authors:
-    - frere
+    - Frere, Jonathan
 layout: blogpost
 title_image: docker-cover.jpg
 categories:
diff --git a/_posts/2020/09/2020-09-25-getting-started-with-docker-2.md b/_posts/2020/09/2020-09-25-getting-started-with-docker-2.md
index a83603e542b74fc4d886366709794250b47ab927..5b92d999a23ae5a5effbc781423336925170cf86 100644
--- a/_posts/2020/09/2020-09-25-getting-started-with-docker-2.md
+++ b/_posts/2020/09/2020-09-25-getting-started-with-docker-2.md
@@ -2,7 +2,7 @@
 title: "Docker for Science (Part 2)"
 date: 2020-09-25
 authors:
-  - frere
+  - Frere, Jonathan
 layout: blogpost
 title_image: docker-cover.jpg
 categories:
diff --git a/_posts/2020/09/2020-09-29-getting-started-with-docker-3.md b/_posts/2020/09/2020-09-29-getting-started-with-docker-3.md
index fcf90529a8111049b5cd746add21407797362fd3..0ed4ec6593a51ba2174b0af2d78fbbe3c6dafdbb 100644
--- a/_posts/2020/09/2020-09-29-getting-started-with-docker-3.md
+++ b/_posts/2020/09/2020-09-29-getting-started-with-docker-3.md
@@ -2,7 +2,7 @@
 title: "Docker for Science (Part 3)"
 date: 2020-09-29
 authors:
-    - frere
+    - Frere, Jonathan
 layout: blogpost
 title_image: docker-cover.jpg
 categories:
diff --git a/_posts/2020/12/2020-12-16-survey-results-consulting.md b/_posts/2020/12/2020-12-16-survey-results-consulting.md
index 65b3ba672a474547a790060f5b72f085fae8f8aa..72dc893d0bed5ea8677ed40115ae1e8cdc066757 100644
--- a/_posts/2020/12/2020-12-16-survey-results-consulting.md
+++ b/_posts/2020/12/2020-12-16-survey-results-consulting.md
@@ -3,7 +3,7 @@ layout: blogpost
 title: "HIFIS Survey 2020: Consulting"
 date: 2020-12-16
 authors:
-    - frere
+    - Frere, Jonathan
 title_image: default
 categories:
     - report