diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 84518a34a9b..1b145667346 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,16 +4,16 @@
 
 | Maintainer         | GitHub ID                                           |                              Affiliation |
 | ------------------ | --------------------------------------------------- | ---------------------------------------: |
-| Antonio Gámez Díaz | [antgamdia](https://github.com/antgamdia)           | [VMware](https://www.github.com/vmware/) |
 | Dimitri Laloue     | [dlaloue-vmware](https://github.com/dlaloue-vmware) | [VMware](https://www.github.com/vmware/) |
 | Greg Fichtenholtz  | [gfichtenholt](https://github.com/gfichtenholt)     | [VMware](https://www.github.com/vmware/) |
-| Jesús Benito       | [beni0888](https://github.com/beni0888)             | [VMware](https://www.github.com/vmware/) |
 | Michael Nelson     | [absoludity](https://github.com/absoludity)         | [VMware](https://www.github.com/vmware/) |
 | Pepe Baena         | [ppbaena](https://github.com/ppbaena)               | [VMware](https://www.github.com/vmware/) |
-| Rafa Castelblanque | [castelblanque](https://github.com/castelblanque)   | [VMware](https://www.github.com/vmware/) |
 
 ## Emeritus Maintainers
 
+- Jesús Benito ([beni0888](https://github.com/beni0888))
+- Antonio Gámez Díaz ([antgamdia](https://github.com/antgamdia))
+- Rafa Castelblanque ([castelblanque](https://github.com/castelblanque))
 - Andrés Martínez Gotor ([andresmgot](https://github.com/andresmgot))
 - Adnan Abdulhussein ([prydonius](https://github.com/prydonius))
 - Ara Pulido ([arapulido](https://github.com/arapulido))
diff --git a/site/content/contributors/3-agamez.md b/site/content/contributors/3-agamez.md
deleted file mode 100644
index 98eb99532c0..00000000000
--- a/site/content/contributors/3-agamez.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-full_name: Antonio Gámez
-image: /img/team/agamez.png
-github_handle: antgamdia
-role: Software Engineer
----
diff --git a/site/content/contributors/4-gfichtenholtz.md b/site/content/contributors/3-gfichtenholtz.md
similarity index 100%
rename from site/content/contributors/4-gfichtenholtz.md
rename to site/content/contributors/3-gfichtenholtz.md
diff --git a/site/content/contributors/6-dlaloue.md b/site/content/contributors/4-dlaloue.md
similarity index 100%
rename from site/content/contributors/6-dlaloue.md
rename to site/content/contributors/4-dlaloue.md
diff --git a/site/content/contributors/5-rcastelblanque.md b/site/content/contributors/5-rcastelblanque.md
deleted file mode 100644
index f0ee3697ba1..00000000000
--- a/site/content/contributors/5-rcastelblanque.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-full_name: Rafa Castelblanque
-image: /img/team/rcastelblanque.png
-github_handle: castelblanque
-role: Software Engineer
----
diff --git a/site/content/contributors/7-jbenito.md b/site/content/contributors/7-jbenito.md
deleted file mode 100644
index 477225ceb3a..00000000000
--- a/site/content/contributors/7-jbenito.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-full_name: Jesús Benito
-image: /img/team/jbenito.png
-github_handle: beni0888
-role: Software Engineer
----
diff --git a/site/themes/template/static/img/team/agamez.png b/site/themes/template/static/img/team/agamez.png
deleted file mode 100644
index 55953592564..00000000000
Binary files a/site/themes/template/static/img/team/agamez.png and /dev/null differ
diff --git a/site/themes/template/static/img/team/jbenito.png b/site/themes/template/static/img/team/jbenito.png
deleted file mode 100644
index fda30093e13..00000000000
Binary files a/site/themes/template/static/img/team/jbenito.png and /dev/null differ
diff --git a/site/themes/template/static/img/team/rcastelblanque.png b/site/themes/template/static/img/team/rcastelblanque.png
deleted file mode 100644
index 2a08a41b35d..00000000000
Binary files a/site/themes/template/static/img/team/rcastelblanque.png and /dev/null differ