diff --git a/apps/web/data/speakers.json b/apps/web/data/speakers.json
index 4938dcfb..f0a29772 100644
--- a/apps/web/data/speakers.json
+++ b/apps/web/data/speakers.json
@@ -5,7 +5,7 @@
     "role": "Organizador DojoCon"
   },
   {
-    "picture": "jess.jpg",
+    "picture": "jessicafernandes.jpg",
     "name": "Jéssica Fernandes",
     "role": "Champion"
   },
@@ -30,7 +30,7 @@
     "role": "Responsável Dojo Care"
   },
   {
-    "picture": "gonçalocosta.jpg",
+    "picture": "goncalocosta.jpg",
     "name": "Gonçalo Costa",
     "role": "Responsável Dojo Care"
   },
diff --git a/apps/web/data/team.json b/apps/web/data/team.json
index 8502b507..2b268efb 100644
--- a/apps/web/data/team.json
+++ b/apps/web/data/team.json
@@ -20,12 +20,12 @@
     "role": "Co-Champion"
   },
   {
-    "picture": "ninja.jpg",
+    "picture": "afonsodionisio.jpg",
     "name": "Afonso Dionísio",
     "role": "Responsável Tecnologia e Desenvolvimento"
   },
     {
-    "picture": "ninja.jpg",
+    "picture": "danielpereira.jpg",
     "name": "Daniel Pereira",
     "role": "Responsável Tecnologia e Desenvolvimento"
   },
@@ -45,7 +45,7 @@
     "role": "Responsável Recrutamento e Formação"
   },
   {
-    "picture": "ninja.jpg",
+    "picture": "martagoncalves.jpg",
     "name": "Marta Gonçalves",
     "role": "Responsável Recrutamento e Formação"
   },
@@ -65,7 +65,7 @@
     "role": "Responsável Dojo Care"
   },
   {
-    "picture": "jess.jpg",
+    "picture": "jessicafernandes.jpg",
     "name": "Jéssica Fernandes",
     "role": "Responsável Dojo Care"
   },
@@ -74,6 +74,16 @@
     "name": "Lara Regina",
     "role": "Responsável Dojo Care"
   },
+  {
+    "picture": "afonsocarpinteiro.jpg",
+    "name": "Afonso Carpinteiro",
+    "role": "Mentor"
+  },
+  {
+    "picture": "afonsomartins.jpg",
+    "name": "Afonso Martins",
+    "role": "Mentor"
+  },
   {
     "picture": "afonsopimenta.jpg",
     "name": "Afonso Pimenta",
@@ -85,8 +95,23 @@
     "role": "Mentora"
   },
   {
-    "picture": "cralos.png",
-    "name": "Carlos Barbosa",
+    "picture": "anarita.png",
+    "name": "Ana Rita",
+    "role": "Mentora"
+  },
+  {
+    "picture": "andreiacardoso.jpg",
+    "name": "Andreia Cardoso",
+    "role": "Mentora"
+  },
+  {
+    "picture": "bernardgeorges.jpg",
+    "name": "Bernard Georges",
+    "role": "Mentor"
+  },
+  {
+    "picture": "carlosribeiro.jpg",
+    "name": "Carlos Ribeiro",
     "role": "Mentor"
   },
   {
@@ -99,6 +124,11 @@
     "name": "Diogo Lameira",
     "role": "Mentor"
   },
+  {
+    "picture": "diogomatos.jpg",
+    "name": "Diogo Matos",
+    "role": "Mentor"
+  },
   {
     "picture": "diogoneto.png",
     "name": "Diogo Neto",
@@ -119,13 +149,18 @@
     "name": "Filipe Felício",
     "role": "Mentor"
   },
+  {
+    "picture": "filiperodrigues.jpg",
+    "name": "Filipe Rodrigues",
+    "role": "Mentor"
+  },
   {
     "picture": "franciscacosta.png",
     "name": "Francisca Costa",
     "role": "Mentora"
   },
   {
-    "picture": "gonçalocosta.jpg",
+    "picture": "goncalocosta.jpg",
     "name": "Gonçalo Costa",
     "role": "Mentor"
   },
@@ -134,6 +169,31 @@
     "name": "Guilherme Vara",
     "role": "Mentor"
   },
+  {
+    "picture": "gustavopereira.jpg",
+    "name": "Gustavo Pereira",
+    "role": "Mentor"
+  },
+  {
+    "picture": "heitorfernandes.jpg",
+    "name": "Heitor Fernandes",
+    "role": "Mentor"
+  },
+  {
+    "picture": "henriquepereira.jpg",
+    "name": "Henrique Pereira",
+    "role": "Mentor"
+  },
+  {
+    "picture": "humbertogomes.jpg",
+    "name": "Humberto Gomes",
+    "role": "Mentor"
+  },
+  {
+    "picture": "joanabranco.jpg",
+    "name": "Joana Branco",
+    "role": "Mentora"
+  },
   {
     "picture": "joanafernandes.png",
     "name": "Joana Fernandes",
@@ -150,7 +210,12 @@
     "role": "Mentor"
   },
   {
-    "picture": "joaolobo.png",
+    "picture": "joaocoelho.jpg",
+    "name": "João Coelho",
+    "role": "Mentor"
+  },
+  {
+    "picture": "joaolobo.jpg",
     "name": "João Lobo",
     "role": "Mentor"
   },
@@ -159,16 +224,41 @@
     "name": "Jorge Teixeira",
     "role": "Mentor"
   },
+  {
+    "picture": "josefonte.jpg",
+    "name": "José Fonte",
+    "role": "Mentor"
+  },
+  {
+    "picture": "joselopes.jpg",
+    "name": "José Lopes",
+    "role": "Mentor"
+  },
   {
     "picture": "joséoliveira.jpg",
     "name": "José Oliveira",
     "role": "Mentor"
   },
+  {
+    "picture": "luisfelicio.jpg",
+    "name": "Luis Felício",
+    "role": "Mentor"
+  },
+  {
+    "picture": "luispereira.jpg",
+    "name": "Luís Pereira",
+    "role": "Mentor"
+  },
   {
     "picture": "manelcarvalho.jpg",
     "name": "Manuel Carvalho",
     "role": "Mentor"
   },
+  {
+    "picture": "mariavale.jpg",
+    "name": "Maria Vale",
+    "role": "Mentora"
+  },
   {
     "picture": "martarodrigues.png",
     "name": "Marta Rodrigues",
@@ -185,7 +275,7 @@
     "role": "Mentor"
   },
   {
-    "picture": "nelsonalmeida.png",
+    "picture": "nelsonalmeida.jpg",
     "name": "Nelson Almeida",
     "role": "Mentor"
   },
@@ -194,6 +284,11 @@
     "name": "Nuno Costa",
     "role": "Mentor"
   },
+  {
+    "picture": "nunofernandes.jpg",
+    "name": "Nuno Fernandes",
+    "role": "Mentor"
+  },
   {
     "picture": "pedrolopes.jpg",
     "name": "Pedro Lopes",
@@ -238,5 +333,10 @@
     "picture": "vitorlelis.jpg",
     "name": "Vitor Lelis",
     "role": "Mentor"
+  },
+  {
+    "picture": "zitaduarte.jpg",
+    "name": "Zita Duarte",
+    "role": "Mentora"
   }
 ]
diff --git a/apps/web/public/img/team/afonsocarpinteiro.jpg b/apps/web/public/img/team/afonsocarpinteiro.jpg
new file mode 100644
index 00000000..df685431
Binary files /dev/null and b/apps/web/public/img/team/afonsocarpinteiro.jpg differ
diff --git a/apps/web/public/img/team/afonsodionisio.jpg b/apps/web/public/img/team/afonsodionisio.jpg
new file mode 100644
index 00000000..fd47f481
Binary files /dev/null and b/apps/web/public/img/team/afonsodionisio.jpg differ
diff --git a/apps/web/public/img/team/afonsomartins.jpg b/apps/web/public/img/team/afonsomartins.jpg
new file mode 100644
index 00000000..a08036b4
Binary files /dev/null and b/apps/web/public/img/team/afonsomartins.jpg differ
diff --git a/apps/web/public/img/team/afonsopimenta.jpg b/apps/web/public/img/team/afonsopimenta.jpg
index 1e6fcbb5..7768cf38 100644
Binary files a/apps/web/public/img/team/afonsopimenta.jpg and b/apps/web/public/img/team/afonsopimenta.jpg differ
diff --git a/apps/web/public/img/team/andreiacardoso.jpg b/apps/web/public/img/team/andreiacardoso.jpg
new file mode 100644
index 00000000..f6bf32e1
Binary files /dev/null and b/apps/web/public/img/team/andreiacardoso.jpg differ
diff --git a/apps/web/public/img/team/bernardgeorges.jpg b/apps/web/public/img/team/bernardgeorges.jpg
new file mode 100644
index 00000000..0a457775
Binary files /dev/null and b/apps/web/public/img/team/bernardgeorges.jpg differ
diff --git a/apps/web/public/img/team/carlosribeiro.jpg b/apps/web/public/img/team/carlosribeiro.jpg
new file mode 100644
index 00000000..c02b09b1
Binary files /dev/null and b/apps/web/public/img/team/carlosribeiro.jpg differ
diff --git a/apps/web/public/img/team/cralos.png b/apps/web/public/img/team/cralos.png
deleted file mode 100644
index e8cbc27d..00000000
Binary files a/apps/web/public/img/team/cralos.png and /dev/null differ
diff --git a/apps/web/public/img/team/danielpereira.jpg b/apps/web/public/img/team/danielpereira.jpg
new file mode 100644
index 00000000..ffd54447
Binary files /dev/null and b/apps/web/public/img/team/danielpereira.jpg differ
diff --git a/apps/web/public/img/team/danieltinoco.jpg b/apps/web/public/img/team/danieltinoco.jpg
deleted file mode 100644
index 075b55c5..00000000
Binary files a/apps/web/public/img/team/danieltinoco.jpg and /dev/null differ
diff --git a/apps/web/public/img/team/diogomatos.jpg b/apps/web/public/img/team/diogomatos.jpg
new file mode 100644
index 00000000..ffb1c2d9
Binary files /dev/null and b/apps/web/public/img/team/diogomatos.jpg differ
diff --git a/apps/web/public/img/team/filiperodrigues.jpg b/apps/web/public/img/team/filiperodrigues.jpg
new file mode 100644
index 00000000..b2e2b540
Binary files /dev/null and b/apps/web/public/img/team/filiperodrigues.jpg differ
diff --git a/apps/web/public/img/team/goncalocosta.jpg b/apps/web/public/img/team/goncalocosta.jpg
new file mode 100644
index 00000000..a3859c45
Binary files /dev/null and b/apps/web/public/img/team/goncalocosta.jpg differ
diff --git "a/apps/web/public/img/team/gon\303\247alocosta.jpg" "b/apps/web/public/img/team/gon\303\247alocosta.jpg"
deleted file mode 100644
index ebadc101..00000000
Binary files "a/apps/web/public/img/team/gon\303\247alocosta.jpg" and /dev/null differ
diff --git a/apps/web/public/img/team/guardapedropereira.jpg b/apps/web/public/img/team/guardapedropereira.jpg
index 8d79a863..89fdea58 100644
Binary files a/apps/web/public/img/team/guardapedropereira.jpg and b/apps/web/public/img/team/guardapedropereira.jpg differ
diff --git a/apps/web/public/img/team/gustavopereira.jpg b/apps/web/public/img/team/gustavopereira.jpg
new file mode 100644
index 00000000..80cccc86
Binary files /dev/null and b/apps/web/public/img/team/gustavopereira.jpg differ
diff --git a/apps/web/public/img/team/heitorfernandes.jpg b/apps/web/public/img/team/heitorfernandes.jpg
new file mode 100644
index 00000000..33fa9d43
Binary files /dev/null and b/apps/web/public/img/team/heitorfernandes.jpg differ
diff --git a/apps/web/public/img/team/heldergomes.jpg b/apps/web/public/img/team/heldergomes.jpg
index fb9811c6..1993a144 100644
Binary files a/apps/web/public/img/team/heldergomes.jpg and b/apps/web/public/img/team/heldergomes.jpg differ
diff --git a/apps/web/public/img/team/henriquepereira.jpg b/apps/web/public/img/team/henriquepereira.jpg
index 445cbafa..7a1d31d6 100644
Binary files a/apps/web/public/img/team/henriquepereira.jpg and b/apps/web/public/img/team/henriquepereira.jpg differ
diff --git a/apps/web/public/img/team/humbertogomes.jpg b/apps/web/public/img/team/humbertogomes.jpg
new file mode 100644
index 00000000..15d5e44d
Binary files /dev/null and b/apps/web/public/img/team/humbertogomes.jpg differ
diff --git a/apps/web/public/img/team/jess.jpg b/apps/web/public/img/team/jess.jpg
deleted file mode 100644
index 294ec1bd..00000000
Binary files a/apps/web/public/img/team/jess.jpg and /dev/null differ
diff --git a/apps/web/public/img/team/jessicafernandes.jpg b/apps/web/public/img/team/jessicafernandes.jpg
new file mode 100644
index 00000000..ec6ac0a7
Binary files /dev/null and b/apps/web/public/img/team/jessicafernandes.jpg differ
diff --git a/apps/web/public/img/team/joanabranco.jpg b/apps/web/public/img/team/joanabranco.jpg
new file mode 100644
index 00000000..f02bde0e
Binary files /dev/null and b/apps/web/public/img/team/joanabranco.jpg differ
diff --git a/apps/web/public/img/team/joaocoelho.jpg b/apps/web/public/img/team/joaocoelho.jpg
new file mode 100644
index 00000000..2187fd7b
Binary files /dev/null and b/apps/web/public/img/team/joaocoelho.jpg differ
diff --git a/apps/web/public/img/team/joaolobo.jpg b/apps/web/public/img/team/joaolobo.jpg
new file mode 100644
index 00000000..b5bae770
Binary files /dev/null and b/apps/web/public/img/team/joaolobo.jpg differ
diff --git a/apps/web/public/img/team/joaolobo.png b/apps/web/public/img/team/joaolobo.png
deleted file mode 100644
index 79dbcef8..00000000
Binary files a/apps/web/public/img/team/joaolobo.png and /dev/null differ
diff --git a/apps/web/public/img/team/josefonte.jpg b/apps/web/public/img/team/josefonte.jpg
new file mode 100644
index 00000000..f1064dee
Binary files /dev/null and b/apps/web/public/img/team/josefonte.jpg differ
diff --git a/apps/web/public/img/team/joselopes.jpg b/apps/web/public/img/team/joselopes.jpg
new file mode 100644
index 00000000..e73d6e9b
Binary files /dev/null and b/apps/web/public/img/team/joselopes.jpg differ
diff --git a/apps/web/public/img/team/luisfelicio.jpg b/apps/web/public/img/team/luisfelicio.jpg
new file mode 100644
index 00000000..efc10815
Binary files /dev/null and b/apps/web/public/img/team/luisfelicio.jpg differ
diff --git a/apps/web/public/img/team/luispereira.jpg b/apps/web/public/img/team/luispereira.jpg
new file mode 100644
index 00000000..94540295
Binary files /dev/null and b/apps/web/public/img/team/luispereira.jpg differ
diff --git a/apps/web/public/img/team/mariavale.jpg b/apps/web/public/img/team/mariavale.jpg
new file mode 100644
index 00000000..27ea3d99
Binary files /dev/null and b/apps/web/public/img/team/mariavale.jpg differ
diff --git a/apps/web/public/img/team/mariorodrigues.jpg b/apps/web/public/img/team/mariorodrigues.jpg
index 4df1532d..6fa8a1bb 100644
Binary files a/apps/web/public/img/team/mariorodrigues.jpg and b/apps/web/public/img/team/mariorodrigues.jpg differ
diff --git a/apps/web/public/img/team/martagoncalves.jpg b/apps/web/public/img/team/martagoncalves.jpg
new file mode 100644
index 00000000..a70eface
Binary files /dev/null and b/apps/web/public/img/team/martagoncalves.jpg differ
diff --git a/apps/web/public/img/team/nelsonalmeida.jpg b/apps/web/public/img/team/nelsonalmeida.jpg
new file mode 100644
index 00000000..0402eade
Binary files /dev/null and b/apps/web/public/img/team/nelsonalmeida.jpg differ
diff --git a/apps/web/public/img/team/nelsonalmeida.png b/apps/web/public/img/team/nelsonalmeida.png
deleted file mode 100644
index 1326d7f0..00000000
Binary files a/apps/web/public/img/team/nelsonalmeida.png and /dev/null differ
diff --git a/apps/web/public/img/team/nelsonestevao.jpg b/apps/web/public/img/team/nelsonestevao.jpg
deleted file mode 100644
index 7446c038..00000000
Binary files a/apps/web/public/img/team/nelsonestevao.jpg and /dev/null differ
diff --git a/apps/web/public/img/team/nunofernandes.jpg b/apps/web/public/img/team/nunofernandes.jpg
new file mode 100644
index 00000000..be77d4bf
Binary files /dev/null and b/apps/web/public/img/team/nunofernandes.jpg differ
diff --git a/apps/web/public/img/team/zitaduarte.jpg b/apps/web/public/img/team/zitaduarte.jpg
new file mode 100644
index 00000000..6bac97f9
Binary files /dev/null and b/apps/web/public/img/team/zitaduarte.jpg differ