diff --git a/_data/kit_versions.yml b/_data/kit_versions.yml
index 583b7eee..a2ee278c 100644
--- a/_data/kit_versions.yml
+++ b/_data/kit_versions.yml
@@ -6,6 +6,11 @@
 #   changelog:
 #     - Changed something
 #     - Changed another thing too
+- version: 2025.0.0
+  released: 2024-09-01
+  link: https://github.com/srobo/robot-image/releases/download/2025.0.0/Student.Robotics.OS-image-2025.0.0.img.xz
+  changelog:
+    - Initial release for SR2025.
 - version: 2024.1.0
   released: 2023-09-14
   link: https://github.com/srobo/robot-image/releases/download/2024.1.0/Student.Robotics.OS-image-2024.1.0.img.xz
diff --git a/_includes/updates-list.html b/_includes/updates-list.html
index cb27e3a6..2f3f5bf3 100644
--- a/_includes/updates-list.html
+++ b/_includes/updates-list.html
@@ -1,20 +1,30 @@
-{% for kit_version in site.data.kit_versions %}
-  {% assign version = kit_version.version %}
-  {% if forloop.first %}
-  <h2><code><strong>{{ version }}</strong> ({{ kit_version.released | date_to_string }})</code> </h2>
-  {% else %}
-  <h2><code>{{ version }} ({{ kit_version.released | date_to_string }})</code></h2>
-  {% endif %}
-  {% if kit_version.yanked %}
-  <p>This version is no longer available.</p>
-  {% else %}
-  <a class="kit-download-link" data-version="{{ version }}" href="{{ kit_version.link }}">
-      Download {{ version }}
-  </a>
-  {% endif %}
-  <ul>
-  {% for log in kit_version.changelog %}
-    <li>{{log }}</li>
-  {% endfor %}
-  </ul>
-{% endfor %}
\ No newline at end of file
+{% assign grouped_kit_versions = site.data.kit_versions | group_by_exp: 'item', 'item.version | split: "." | first`' %}
+{% assign latest_version = site.data.kit_versions | first %}
+
+
+{% for group in grouped_kit_versions %}
+<h2>{{ group.name }}</h2>
+{% for kit_version in group.items %}
+{% assign version = kit_version.version %}
+{% if kit_version == latest_version %}
+<h3><code><strong>{{ version }}</strong> ({{ kit_version.released | date_to_string }})</code> </h3>
+{% else %}
+<h3><code>{{ version }} ({{ kit_version.released | date_to_string }})</code></h3>
+{% endif %}
+{% if kit_version.yanked %}
+<p>This version is no longer available.</p>
+{% else %}
+<a class="kit-download-link" data-version="{{ version }}" href="{{ kit_version.link }}">
+    Download {{ version }}
+</a>
+{% endif %}
+<ul>
+{% for log in kit_version.changelog %}
+  <li>{{ log }}</li>
+{% endfor %}
+</ul>
+{% endfor %}
+{% if forloop.first %}
+<div class="warning">Using a version from a previous competition may have unintended side-effects. Only install versions from the same competition year.</div>
+{% endif %}
+{% endfor %}
diff --git a/kit/brain_board/robot_os.md b/kit/brain_board/robot_os.md
index 899876aa..3f84a285 100644
--- a/kit/brain_board/robot_os.md
+++ b/kit/brain_board/robot_os.md
@@ -22,11 +22,4 @@ Below is a list of the versions released, once you have downloaded the file you
 Each update file is a complete upgrade and contains all the changes of those before it.
 If you need to jump up multiple versions, you can do so by just using the latest version.
 
-
-## OS Versions
-
-{% if site.data.kit_versions.size > 0 %}
 {% include updates-list.html %}
-{% else %}
-There are currently no updates available.
-{% endif %}