diff --git a/content/roadmap/index.html b/content/roadmap/index.html
index a79e509ddd..ef122ad93d 100644
--- a/content/roadmap/index.html
+++ b/content/roadmap/index.html
@@ -25,7 +25,7 @@
 <div class="roadmap-page-container">
   <section class="current-milestone">
     <h2>Current Milestone: v0.2.0 - Web server/api refactor</h2>
-    There are <strong>6</strong> open issues left to be
+    There are <strong>7</strong> open issues left to be
     addressed, with <strong>24</strong> previously
     completed and closed.
     <a href="https://github.com/owncast/owncast/milestone/26" target="_blank"
@@ -41,6 +41,44 @@ <h3>In Progress</h3>
     These items are assigned to a person and are being worked on.
     <div class="leaderboard__profiles">
       
+      <a href="https://github.com/owncast/owncast/issues/3812" target="_blank">
+        <article class="leaderboard__profile">
+          <img
+            src="https://avatars.githubusercontent.com/u/11348778?v=4"
+            alt="Manish-Giri"
+            class="leaderboard__picture"
+          />
+          <span class="leaderboard__name">Admin Edit Social Handle save without name</span>
+          <span class="leaderboard__value">
+            
+            <span
+              class="issue-tag"
+              style="background-color: #d73a4a"
+              >bug</span
+            >
+            
+            <span
+              class="issue-tag"
+              style="background-color: #7057ff"
+              >good first issue</span
+            >
+            
+            <span
+              class="issue-tag"
+              style="background-color: #e0db53"
+              >Web frontend</span
+            >
+            
+            <span
+              class="issue-tag"
+              style="background-color: #a06bc7"
+              >admin</span
+            >
+            
+          </span>
+        </article>
+      </a>
+      
       <a href="https://github.com/owncast/owncast/issues/3778" target="_blank">
         <article class="leaderboard__profile">
           <img
@@ -67,64 +105,41 @@ <h3>In Progress</h3>
         </article>
       </a>
       
-      <a href="https://github.com/owncast/owncast/issues/3080" target="_blank">
+      <a href="https://github.com/owncast/owncast/issues/3081" target="_blank">
         <article class="leaderboard__profile">
           <img
             src="https://avatars.githubusercontent.com/u/414923?v=4"
             alt="gabek"
             class="leaderboard__picture"
           />
-          <span class="leaderboard__name">Create ConfigRepository</span>
+          <span class="leaderboard__name">Create and use a new ChatMessageRepository</span>
           <span class="leaderboard__value">
             
           </span>
         </article>
       </a>
       
-    </div>
-
-    <h3>To Do</h3>
-    These issues are not currently assigned to anybody and still need to be
-    completed for a release to take place.
-    <div class="leaderboard__profiles">
-      
-      <a href="https://github.com/owncast/owncast/issues/3812" target="_blank">
+      <a href="https://github.com/owncast/owncast/issues/3080" target="_blank">
         <article class="leaderboard__profile">
           <img
-            src="https://owncast.online/images/logo.svg"
+            src="https://avatars.githubusercontent.com/u/414923?v=4"
+            alt="gabek"
             class="leaderboard__picture"
           />
-          <span class="leaderboard__name">Admin Edit Social Handle save without name</span>
+          <span class="leaderboard__name">Create ConfigRepository</span>
           <span class="leaderboard__value">
             
-            <span
-              class="issue-tag"
-              style="background-color: #d73a4a"
-              >bug</span
-            >
-            
-            <span
-              class="issue-tag"
-              style="background-color: #7057ff"
-              >good first issue</span
-            >
-            
-            <span
-              class="issue-tag"
-              style="background-color: #e0db53"
-              >Web frontend</span
-            >
-            
-            <span
-              class="issue-tag"
-              style="background-color: #a06bc7"
-              >admin</span
-            >
-            
           </span>
         </article>
       </a>
       
+    </div>
+
+    <h3>To Do</h3>
+    These issues are not currently assigned to anybody and still need to be
+    completed for a release to take place.
+    <div class="leaderboard__profiles">
+      
       <a href="https://github.com/owncast/owncast/issues/3683" target="_blank">
         <article class="leaderboard__profile">
           <img