diff --git a/_data/hifis_team.yml b/_data/hifis_team.yml
index 91b3477d915e558670faa17034f30e74a9366298..78e788965f400819359354b0facc0b0ee7ed1818 100644
--- a/_data/hifis_team.yml
+++ b/_data/hifis_team.yml
@@ -30,14 +30,6 @@
 #       - 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:
@@ -45,14 +37,6 @@
   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:
@@ -76,7 +60,7 @@
     campus: desy
   position: "Coordinator and Speaker of HIFIS"
   associate: false
-  rank: 4
+  rank: 1
   cluster: overall
 - id: hueser
   name: "Hüser, Christian"
@@ -93,7 +77,7 @@
     campus: hzb
   position: "Coordinator"
   associate: false
-  rank: 3
+  rank: 1
   cluster: overall
 - id: konrad
   name: "Konrad, Uwe"
@@ -102,7 +86,7 @@
     campus: hzdr
   position: "Coordinator"
   associate: false
-  rank: 3
+  rank: 1
   cluster: overall
 - id: jandt
   name: "Jandt, Uwe"
@@ -111,7 +95,7 @@
     campus: desy
   position: "HIFIS Overall Management"
   associate: false
-  rank: 2
+  rank: 1
   cluster: overall
 - id: fuhrmann
   name: "Fuhrmann, Patrick"
@@ -202,7 +186,7 @@
   location:
     campus: hzdr
   position: "HIFIS public relations"
-  rank: 0
+  rank: 2
   associate: false
   cluster: overall
 - id: klaffki
@@ -210,6 +194,6 @@
   location:
     campus: desy
   position: "HIFIS public relations"
-  rank: 0
+  rank: 2
   associate: false
   cluster: overall
diff --git a/_layouts/team.html b/_layouts/team.html
index e1e71234ef3a3f88b3d0394715955224606964c2..4300f90f61e3629147df28fc6d965b42e36e643d 100644
--- a/_layouts/team.html
+++ b/_layouts/team.html
@@ -26,10 +26,18 @@ It does on purpose NOT include the content of the markdown page.
                     <code class="language-plaintext highlighter-rouge"><a href="mailto:office@hifis.net">office@hifis.net</a></code>
 
 
-                    <h1>Team</h1>
+                    <h1>Coordinators and HIFIS Cluster Managers</h1>
                     <div class="team_list">
                         {%- for person in team_members_core -%}
-                        {%- if person.rank >= 1 -%}
+                        {%- if person.rank == 1 -%}
+                        {%- include team_card.html person=person -%}
+                        {%- endif -%}
+                        {%- endfor -%}
+                    </div>
+                    <h1>Communication Officers</h1>
+                    <div class="team_list">
+                        {%- for person in team_members_core -%}
+                        {%- if person.rank == 2 -%}
                         {%- include team_card.html person=person -%}
                         {%- endif -%}
                         {%- endfor -%}