diff --git a/assets/icons/gsoc.svg b/assets/icons/gsoc.svg
new file mode 100644
index 0000000000..1b1328c53a
--- /dev/null
+++ b/assets/icons/gsoc.svg
@@ -0,0 +1,9 @@
+
+
diff --git a/config.toml b/config.toml
index 07e5839aa7..4af0dc34ed 100644
--- a/config.toml
+++ b/config.toml
@@ -33,6 +33,12 @@ ignoreFiles = []
pre = ""
post = "
April 1st, 2025 London, England "
url = "https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/co-located-events/kubeflow-summit/"
+ [[menu.main]]
+ name = "GSoC 2025"
+ weight = -900
+ pre = ""
+ post = "
Coming Soon"
+ url = "/events/gsoc-2025/"
[[menu.main]]
name = "Docs"
weight = -102
diff --git a/content/en/docs/about/community.md b/content/en/docs/about/community.md
index ac79a47245..d3a1781b65 100644
--- a/content/en/docs/about/community.md
+++ b/content/en/docs/about/community.md
@@ -78,7 +78,7 @@ The following list shows available Kubeflow community meetings with the correspo
| Kubeflow Spark Operator call | [Google Doc](https://bit.ly/3VGzP4n) | [YouTube playlist](https://www.youtube.com/playlist?list=PLmzRWLV1CK_xXuM6gALgBG8vDZHFCNxce) |
| KServe call | [Google Doc](https://bit.ly/3NlKFb3) | |
-### Kubeflow Community Calendar |
+### Kubeflow Community Calendar
This is an aggregated view of the Kubeflow community calendar and should be displayed in your
device's timezone.
diff --git a/content/en/docs/images/logos/gsoc.svg b/content/en/docs/images/logos/gsoc.svg
new file mode 100644
index 0000000000..1b1328c53a
--- /dev/null
+++ b/content/en/docs/images/logos/gsoc.svg
@@ -0,0 +1,9 @@
+
+
diff --git a/content/en/events/docs.md b/content/en/events/docs.md
deleted file mode 100644
index bc029d81a5..0000000000
--- a/content/en/events/docs.md
+++ /dev/null
@@ -1,7 +0,0 @@
-+++
-title = "Documentation"
-description = "Return to Kubeflow documentation"
-weight = 1
-manualLink = "/docs/about/"
-icon = "fa-solid fa-arrow-up-right-from-square"
-+++
\ No newline at end of file
diff --git a/content/en/events/past-events/2023/_index.md b/content/en/events/past-events/2023/_index.md
new file mode 100644
index 0000000000..f7d3a4296d
--- /dev/null
+++ b/content/en/events/past-events/2023/_index.md
@@ -0,0 +1,4 @@
++++
+title = "2023"
+description = "Events from 2023"
++++
diff --git a/content/en/events/kubeflow-summit-2023.md b/content/en/events/past-events/2023/kubeflow-summit-2023.md
similarity index 98%
rename from content/en/events/kubeflow-summit-2023.md
rename to content/en/events/past-events/2023/kubeflow-summit-2023.md
index ca2b499267..19125ac12d 100644
--- a/content/en/events/kubeflow-summit-2023.md
+++ b/content/en/events/past-events/2023/kubeflow-summit-2023.md
@@ -1,6 +1,13 @@
+++
title = "Kubeflow Summit 2023"
description = "October 6th, 2023 - Irving, TX, USA - Virtual Attendance Available"
+icon = "fa-solid fa-calendar-day"
+
+#
+# NOTE: to avoid 404 when we move events to the "/past-events/",
+# we explicitly set the URL here so it doesn't change
+#
+url = "/events/kubeflow-summit-2023/"
+++
---
diff --git a/content/en/events/past-events/2023/watch--kubeflow-summit-2023.md b/content/en/events/past-events/2023/watch--kubeflow-summit-2023.md
new file mode 100644
index 0000000000..ef0e550b41
--- /dev/null
+++ b/content/en/events/past-events/2023/watch--kubeflow-summit-2023.md
@@ -0,0 +1,6 @@
++++
+title = "Watch: Kubeflow Summit 2023"
+
+manualLink = "https://www.youtube.com/playlist?list=PL2gwy7BdKoGdrkYIWGeAdKi9ntfxq8FYt"
+icon = "fa-brands fa-youtube"
++++
\ No newline at end of file
diff --git a/content/en/events/past-events/2024/_index.md b/content/en/events/past-events/2024/_index.md
new file mode 100644
index 0000000000..5b1424ed68
--- /dev/null
+++ b/content/en/events/past-events/2024/_index.md
@@ -0,0 +1,4 @@
++++
+title = "2024"
+description = "Events from 2024"
++++
diff --git a/content/en/events/gsoc-2024.md b/content/en/events/past-events/2024/gsoc-2024.md
similarity index 98%
rename from content/en/events/gsoc-2024.md
rename to content/en/events/past-events/2024/gsoc-2024.md
index e796736fa8..7943b9dcc3 100644
--- a/content/en/events/gsoc-2024.md
+++ b/content/en/events/past-events/2024/gsoc-2024.md
@@ -1,6 +1,13 @@
+++
title = "Google Summer of Code 2024"
description = "Google Summer of Code 2024"
+icon = "fa-solid fa-calendar-day"
+
+#
+# NOTE: to avoid 404 when we move events to the "/past-events/",
+# we explicitly set the URL here so it doesn't change
+#
+url = "/events/gsoc-2024/"
+++
---
diff --git a/content/en/events/past-events/2024/watch--kubeflow-summit-2024.md b/content/en/events/past-events/2024/watch--kubeflow-summit-2024.md
new file mode 100644
index 0000000000..3e1ed5ada7
--- /dev/null
+++ b/content/en/events/past-events/2024/watch--kubeflow-summit-2024.md
@@ -0,0 +1,6 @@
++++
+title = "Watch: Kubeflow Summit 2024"
+
+manualLink = "https://www.youtube.com/playlist?list=PLj6h78yzYM2Nk-8Zyjaefz9yFJ-NxC-qn"
+icon = "fa-brands fa-youtube"
++++
\ No newline at end of file
diff --git a/content/en/events/past-events/2024/watch--kubernetes-ai-day-2024.md b/content/en/events/past-events/2024/watch--kubernetes-ai-day-2024.md
new file mode 100644
index 0000000000..5d682f1739
--- /dev/null
+++ b/content/en/events/past-events/2024/watch--kubernetes-ai-day-2024.md
@@ -0,0 +1,6 @@
++++
+title = "Watch: Cloud Native & Kubernetes AI Day 2024"
+
+manualLink = "https://www.youtube.com/playlist?list=PLj6h78yzYM2Mvqk_mNejD7kbe3tldxxsr"
+icon = "fa-brands fa-youtube"
++++
\ No newline at end of file
diff --git a/content/en/events/past-events/_index.md b/content/en/events/past-events/_index.md
new file mode 100644
index 0000000000..53ddff7e92
--- /dev/null
+++ b/content/en/events/past-events/_index.md
@@ -0,0 +1,5 @@
++++
+title = "Past Events"
+description = "Past Kubeflow events"
+weight = 200
++++
diff --git a/content/en/events/upcoming-events/_index.md b/content/en/events/upcoming-events/_index.md
new file mode 100644
index 0000000000..651b69b7e9
--- /dev/null
+++ b/content/en/events/upcoming-events/_index.md
@@ -0,0 +1,5 @@
++++
+title = "Future Events"
+description = "Future Kubeflow events"
+weight = 100
++++
diff --git a/content/en/events/upcoming-events/gsoc-2025.md b/content/en/events/upcoming-events/gsoc-2025.md
new file mode 100644
index 0000000000..c5ce2135ad
--- /dev/null
+++ b/content/en/events/upcoming-events/gsoc-2025.md
@@ -0,0 +1,78 @@
++++
+title = "Google Summer of Code 2025"
+description = "Google Summer of Code 2025"
+icon = "fa-regular fa-calendar-day"
+
+#
+# NOTE: to avoid 404 when we move events to the "/past-events/",
+# we explicitly set the URL here so it doesn't change
+#
+url = "/events/gsoc-2025/"
++++
+
+---
+
+The Kubeflow Community plans to participate in [**Google Summer of Code 2025**](https://summerofcode.withgoogle.com/).
+This page aims to help you participate in GSoC 2025 with Kubeflow.
+
+{{% alert title="Note" color="info" %}}
+While Kubeflow participated in [GSoC 2024](/events/gsoc-2024/), we are currently awaiting final confirmation of our participation in GSoC 2025.
+Google will announce the final list of accepted organizations on __February 27, 2025__.
+{{% /alert %}}
+
+## What is GSoC?
+
+Google Summer of Code (GSoC) is a global program that offers students [stipends](https://developers.google.com/open-source/gsoc/help/student-stipends) for working on open-source projects during the summer.
+
+For more information, see the [GSoC FAQ](https://developers.google.com/open-source/gsoc/faq) and watch the video below:
+
+