diff --git a/root-pages/events/index.mdx b/root-pages/events/index.mdx
index edf0950b..36d09eee 100644
--- a/root-pages/events/index.mdx
+++ b/root-pages/events/index.mdx
@@ -21,7 +21,30 @@ import {
 
 <EventCardList
   upcoming={[
+      
+  ]}
+  past={[
       {
+      thumbnail: '/events/eth-latam.png',
+      title: 'Waku at ETHDam',
+      date: 'Apr 12 - Apr 14\n2024',
+      location: 'Amsterdam\nThe Netherlands',
+    },
+    {
+      thumbnail: '/events/eth-latam.png',
+      title: 'Hack with Waku at ETHLATAM : First Waku sponsored hackathon of 2024',
+      date: 'Mar 13 - Mar 14\n2024',
+      location: 'San Pedro Sula\nHonduras',
+      href: '/events/eth-latam',
+    },
+    {
+      thumbnail: '/events/eth-taipei.png',
+      title: 'Waku at ETHTaipei',
+      date: 'Mar 21 - Mar 22\n2024',
+      location: 'Taipei city\nTaiwan',
+      href: '/events/eth-taipei',
+    },
+    {
       thumbnail: '/events/wsas.jpg',
       title: 'Waku at WSAS',
       date: 'May 7 - May 8\n2024',
@@ -78,26 +101,4 @@ import {
       href: '/events/w3pn-prague',
     }
   ]}
-  past={[
-      {
-      thumbnail: '/events/eth-latam.png',
-      title: 'Waku at ETHDam',
-      date: 'Apr 12 - Apr 14\n2024',
-      location: 'Amsterdam\nThe Netherlands',
-    },
-    {
-      thumbnail: '/events/eth-latam.png',
-      title: 'Hack with Waku at ETHLATAM : First Waku sponsored hackathon of 2024',
-      date: 'Mar 13 - Mar 14\n2024',
-      location: 'San Pedro Sula\nHonduras',
-      href: '/events/eth-latam',
-    },
-    {
-      thumbnail: '/events/eth-taipei.png',
-      title: 'Waku at ETHTaipei',
-      date: 'Mar 21 - Mar 22\n2024',
-      location: 'Taipei city\nTaiwan',
-      href: '/events/eth-taipei',
-    },
-  ]}
 />
diff --git a/src/pages/index.mdx b/src/pages/index.mdx
index 5d1ac41d..f18fbb64 100644
--- a/src/pages/index.mdx
+++ b/src/pages/index.mdx
@@ -242,7 +242,7 @@ import Link from '@docusaurus/Link'
 			<Grid.Item>
 				<ProfileCard
         	name='Alvaro R.'
-        	imgSrc='https://avatars.githubusercontent.com/u/8811422?v=4'
+        	imgSrc='/team/alvaro.png'
         	githubUsername='github'
         	githubLink='https://github.com/alrevuelta'
       	/>
@@ -250,7 +250,7 @@ import Link from '@docusaurus/Link'
       <Grid.Item>
 				<ProfileCard
         	name='Arseniy'
-        	imgSrc='https://images7.bamboohr.com/66157/photos/139-1-4.jpg?Policy=eyJTdGF0ZW1lbnQiOlt7IlJlc291cmNlIjoiaHR0cHM6Ly9pbWFnZXM3LmJhbWJvb2hyLmNvbS82NjE1Ny8qIiwiQ29uZGl0aW9uIjp7IkRhdGVHcmVhdGVyVGhhbiI6eyJBV1M6RXBvY2hUaW1lIjoxNzE3MzYxODU5fSwiRGF0ZUxlc3NUaGFuIjp7IkFXUzpFcG9jaFRpbWUiOjE3MTk5NTM4Njl9fX1dfQ__&Signature=gNKD5KdP5bvK0yAQ6VWjktvtekCtbAfru0jG-pX7FCIDbPXVlIRFoR5xmqJuPyNk~WP4~Lkf9KlKv967pdPhzdcwD~Y951wt-KFs-9m-yqGS2aXrff8dWzPzSeXw2Dwz4VKeu5IvQjy-Zs-V-7a~QbhEYc7UC7~xp0njotCz0g~zCBwQmDQtPYMi83TbYJLMYpNzu98SyG0U-ButmT0yjtggrHIJ8q36AzTPkBWxusCJTR6om3UDTJtvBIo1-TyKo1LgPNqOZds-YMY8Dad-6e37Oex0ect6Y3onw~ByMwi0qJWWQRS-61SHHTyTIMyaJRtLkXJ2G5AlQY3JL3z3hg__&Key-Pair-Id=APKAIZ7QQNDH4DJY7K4Q'
+        	imgSrc='/team/arseiny.jpeg'
         	githubUsername='github'
         	githubLink='https://github.com/adklempner'
           discordUsername='arseniy.eth'
@@ -259,7 +259,7 @@ import Link from '@docusaurus/Link'
             <Grid.Item>
 				<ProfileCard
         	name='Danish'
-        	imgSrc='https://avatars.githubusercontent.com/u/35004822?v=4'
+        	imgSrc='/team/danish.jpeg'
         	githubUsername='github'
         	githubLink='https://github.com/danisharora099'
       	/>
@@ -267,7 +267,7 @@ import Link from '@docusaurus/Link'
         <Grid.Item>
 				<ProfileCard
         	name='Franck'
-        	imgSrc='https://fryorcraken.xyz/images/6164.jpg'
+        	imgSrc='/team/franck.jpeg'
         	githubUsername='github'
         	githubLink='https://github.com/fryorcraken'
       	/>
@@ -275,7 +275,7 @@ import Link from '@docusaurus/Link'
         <Grid.Item>
 				<ProfileCard
         	name='Gabriel'
-        	imgSrc='https://avatars.githubusercontent.com/u/101006718?v=4'
+        	imgSrc='/team/gabriel.jpeg'
         	githubUsername='github'
         	githubLink='https://github.com/gabrielmer'
       	/>
@@ -283,7 +283,7 @@ import Link from '@docusaurus/Link'
          <Grid.Item>
 				<ProfileCard
         	name='Guru'
-        	imgSrc='https://pbs.twimg.com/profile_images/1722661065635377152/GjrfHLAC_400x400.jpg'
+        	imgSrc='/team/guru.jpeg'
         	githubUsername='github'
         	githubLink='https://github.com/hackyguru'
       	/>
@@ -291,7 +291,7 @@ import Link from '@docusaurus/Link'
        <Grid.Item>
 				<ProfileCard
         	name='Hanno'
-        	imgSrc='https://avatars.githubusercontent.com/u/68783915?v=4'
+        	imgSrc='/team/hanno.png'
         	githubUsername='github'
         	githubLink='https://github.com/jm-clius'
       	/>
@@ -299,7 +299,7 @@ import Link from '@docusaurus/Link'
       <Grid.Item>
 				<ProfileCard
         	name='Marina'
-        	imgSrc='https://cdn.discordapp.com/avatars/534364526330642452/90ea19cb78e2c9a10a4fffc975f2d303?size=1024'
+        	imgSrc='/team/marina.jpeg'
           discordUsername="crypto_marina"
           discordLink="https://discord.com/users/534364526330642452"
       	/>
@@ -307,7 +307,7 @@ import Link from '@docusaurus/Link'
       <Grid.Item>
 				<ProfileCard
         	name='Pedro'
-        	imgSrc='https://cdn.discordapp.com/avatars/388306101327626240/f4d8470124a2479abe5aaa62e061555d?size=1024'
+        	imgSrc='/team/pedro.png'
           discordUsername="discord"
           discordLink="https://discord.com/users/388306101327626240"
       	/>
@@ -323,7 +323,7 @@ import Link from '@docusaurus/Link'
              <Grid.Item>
 				<ProfileCard
         	name='Richard'
-        	imgSrc='https://avatars.githubusercontent.com/u/1106587?v=4'
+        	imgSrc='/team/richard.png'
         	githubUsername='github'
         	githubLink='https://github.com/richard-ramos/'
       	/>
@@ -331,7 +331,7 @@ import Link from '@docusaurus/Link'
              <Grid.Item>
 				<ProfileCard
         	name='Simon-Pierre'
-        	imgSrc='https://avatars.githubusercontent.com/u/5952132?v=4'
+        	imgSrc='/team/sp.jpeg'
         	githubUsername='github'
         	githubLink='https://github.com/SionoiS'
       	/>
@@ -339,7 +339,7 @@ import Link from '@docusaurus/Link'
              <Grid.Item>
 				<ProfileCard
         	name='Sasha'
-        	imgSrc='https://avatars.githubusercontent.com/u/118575614?v=4'
+        	imgSrc='/team/sasha.png'
         	githubUsername='github'
         	githubLink='https://github.com/weboko'
       	/>
@@ -347,7 +347,7 @@ import Link from '@docusaurus/Link'
               <Grid.Item>
 				<ProfileCard
         	name='Sergei'
-        	imgSrc='https://avatars.githubusercontent.com/u/7126627?v=4'
+        	imgSrc='/team/sergei.jpeg'
         	githubUsername='github'
         	githubLink='https://github.com/s-tikhomirov/'
       	/>
@@ -355,7 +355,7 @@ import Link from '@docusaurus/Link'
               <Grid.Item>
 				<ProfileCard
         	name='Solomon'
-        	imgSrc='https://avatars.githubusercontent.com/u/47832826?v=4'
+        	imgSrc='/team/solomon.png'
         	githubUsername='github'
         	githubLink='https://github.com/LordGhostX'
       	/>
@@ -363,7 +363,7 @@ import Link from '@docusaurus/Link'
                    <Grid.Item>
 				<ProfileCard
         	name='Tanya'
-        	imgSrc='https://avatars.githubusercontent.com/u/120410716?v=4'
+        	imgSrc='/team/tanya.jpeg'
         	githubUsername='github'
         	githubLink='https://github.com/stubbsta'
       	/>
@@ -371,7 +371,7 @@ import Link from '@docusaurus/Link'
      <Grid.Item>
 				<ProfileCard
         	name='Václav'
-        	imgSrc='https://avatars.githubusercontent.com/u/4759808?v=4'
+        	imgSrc='/team/vaclav.jpeg'
         	githubUsername='github'
         	githubLink='https://github.com/vpavlin'
       	/>
@@ -379,7 +379,7 @@ import Link from '@docusaurus/Link'
       <Grid.Item>
 				<ProfileCard
         	name='Zoltan'
-        	imgSrc='https://avatars.githubusercontent.com/u/113987313?v=4'
+        	imgSrc='/team/zoltan.jpeg'
         	githubUsername='github'
         	githubLink='https://github.com/NagyZoltanPeter'
       	/>
diff --git a/static/team/alvaro.png b/static/team/alvaro.png
new file mode 100644
index 00000000..7ceb907f
Binary files /dev/null and b/static/team/alvaro.png differ
diff --git a/static/team/arseiny.jpeg b/static/team/arseiny.jpeg
new file mode 100644
index 00000000..368acbbb
Binary files /dev/null and b/static/team/arseiny.jpeg differ
diff --git a/static/team/danish.jpeg b/static/team/danish.jpeg
new file mode 100644
index 00000000..544576f4
Binary files /dev/null and b/static/team/danish.jpeg differ
diff --git a/static/team/franck.jpeg b/static/team/franck.jpeg
new file mode 100644
index 00000000..42343ca8
Binary files /dev/null and b/static/team/franck.jpeg differ
diff --git a/static/team/gabriel.jpeg b/static/team/gabriel.jpeg
new file mode 100644
index 00000000..c8b61668
Binary files /dev/null and b/static/team/gabriel.jpeg differ
diff --git a/static/team/guru.jpeg b/static/team/guru.jpeg
new file mode 100644
index 00000000..9585b2ed
Binary files /dev/null and b/static/team/guru.jpeg differ
diff --git a/static/team/hanno.png b/static/team/hanno.png
new file mode 100644
index 00000000..ddbef757
Binary files /dev/null and b/static/team/hanno.png differ
diff --git a/static/team/marina.jpeg b/static/team/marina.jpeg
new file mode 100644
index 00000000..d1683f25
Binary files /dev/null and b/static/team/marina.jpeg differ
diff --git a/static/team/pedro.png b/static/team/pedro.png
new file mode 100644
index 00000000..4ede07ec
Binary files /dev/null and b/static/team/pedro.png differ
diff --git a/static/team/richard.png b/static/team/richard.png
new file mode 100644
index 00000000..eb15c41d
Binary files /dev/null and b/static/team/richard.png differ
diff --git a/static/team/sasha.png b/static/team/sasha.png
new file mode 100644
index 00000000..184efbfb
Binary files /dev/null and b/static/team/sasha.png differ
diff --git a/static/team/sergei.jpeg b/static/team/sergei.jpeg
new file mode 100644
index 00000000..e91de5c8
Binary files /dev/null and b/static/team/sergei.jpeg differ
diff --git a/static/team/solomon.png b/static/team/solomon.png
new file mode 100644
index 00000000..638fdea5
Binary files /dev/null and b/static/team/solomon.png differ
diff --git a/static/team/sp.jpeg b/static/team/sp.jpeg
new file mode 100644
index 00000000..7feaf266
Binary files /dev/null and b/static/team/sp.jpeg differ
diff --git a/static/team/tanya.jpeg b/static/team/tanya.jpeg
new file mode 100644
index 00000000..a450b440
Binary files /dev/null and b/static/team/tanya.jpeg differ
diff --git a/static/team/vaclav.jpeg b/static/team/vaclav.jpeg
new file mode 100644
index 00000000..30d6201b
Binary files /dev/null and b/static/team/vaclav.jpeg differ
diff --git a/static/team/zoltan.jpeg b/static/team/zoltan.jpeg
new file mode 100644
index 00000000..222974c5
Binary files /dev/null and b/static/team/zoltan.jpeg differ