diff --git a/src/assets/data/team.json b/src/assets/data/team.json
index 2a00053f..3ccd91d2 100644
--- a/src/assets/data/team.json
+++ b/src/assets/data/team.json
@@ -91,12 +91,6 @@
         "discord": "lulu13022002",
         "github": "Lulu13022002"
       },
-      {
-        "name": "Noah",
-        "avatar": "https://avatars.githubusercontent.com/u/44026893?v=4",
-        "discord": "noah.pm",
-        "github": "NoahvdAa"
-      },
       {
         "name": "Owen",
         "avatar": "https://avatars.githubusercontent.com/u/23108066?v=4",
@@ -122,12 +116,6 @@
         "discord": "4drian3d",
         "github": "4drian3d"
       },
-      {
-        "name": "CoreyShupe",
-        "avatar": "https://avatars.githubusercontent.com/u/37425956?v=4",
-        "discord": "fixed",
-        "github": "CoreyShupe"
-      },
       {
         "name": "Gero",
         "avatar": "https://avatars.githubusercontent.com/u/11089941?v=4",
@@ -139,6 +127,12 @@
         "avatar": "https://avatars.githubusercontent.com/u/16436212?v=4",
         "discord": "possiblytux",
         "github": "astei"
+      },
+      {
+        "name": "Wouter",
+        "avatar": "https://avatars.githubusercontent.com/u/13220320?v=4",
+        "discord": "wouter.g",
+        "github": "WouterGritter"
       }
     ]
   },
@@ -166,6 +160,12 @@
     "name": "Community Team",
     "description": "Community Team members keeps our community a safe and vibrant space. By watching chat, helping newcomers with questions, and making sure everyone follows the community guidelines, PaperMC's community spaces are able to be as fantastic as they are!",
     "members": [
+      {
+        "name": "_11",
+        "avatar": "https://avatars.githubusercontent.com/u/55677189?v=4",
+        "discord": "_11",
+        "github": "underscore11code"
+      },
       {
         "name": "Amaranth",
         "avatar": "https://avatars.githubusercontent.com/u/341418?v=4",
@@ -178,12 +178,6 @@
         "discord": "eternity._.",
         "github": "EterNityCH"
       },
-      {
-        "name": "Glare",
-        "avatar": "https://avatars.githubusercontent.com/u/21014720?v=4",
-        "discord": "glare",
-        "github": "darbyjack"
-      },
       {
         "name": "JRoy",
         "avatar": "https://avatars.githubusercontent.com/u/10731363?v=4",
@@ -203,10 +197,10 @@
         "github": "clrxbl"
       },
       {
-        "name": "NotMyFault",
-        "avatar": "https://avatars.githubusercontent.com/u/13383509?v=4",
-        "discord": "notmyfault",
-        "github": "NotMyFault"
+        "name": "Noah",
+        "avatar": "https://avatars.githubusercontent.com/u/44026893?v=4",
+        "discord": "noah.pm",
+        "github": "NoahvdAa"
       },
       {
         "name": "ocelotpotpie",
@@ -214,12 +208,6 @@
         "discord": "ocelotpotpie",
         "github": "ocelotpotpie"
       },
-      {
-        "name": "Puremin0rez",
-        "avatar": "https://avatars.githubusercontent.com/u/734478?v=4",
-        "discord": "puremin0rez",
-        "github": "Puremin0rez"
-      },
       {
         "name": "stefvanschie",
         "discord": "stefvanschie",
@@ -232,18 +220,6 @@
     "name": "Triage Team",
     "description": "The Triage Team helps the project by reviewing, testing, and organizing our GitHub's issues and pull requests. With their efforts, developers and maintainers are able to most efficiently handle the most important tasks.",
     "members": [
-      {
-        "name": "_11",
-        "avatar": "https://avatars.githubusercontent.com/u/55677189?v=4",
-        "discord": "_11",
-        "github": "underscore11code"
-      },
-      {
-        "name": "Camotoy",
-        "avatar": "https://avatars.githubusercontent.com/u/20743703?v=4",
-        "discord": "camotoy",
-        "github": "camotoy"
-      },
       {
         "name": "Doc",
         "avatar": "https://avatars.githubusercontent.com/u/3602279?v=4",
@@ -262,6 +238,12 @@
         "discord": "malfrador",
         "github": "Malfrador"
       },
+      {
+        "name": "Noah",
+        "avatar": "https://avatars.githubusercontent.com/u/44026893?v=4",
+        "discord": "noah.pm",
+        "github": "NoahvdAa"
+      },
       {
         "name": "Ollie",
         "avatar": "https://avatars.githubusercontent.com/u/69084614?v=4",
@@ -281,6 +263,18 @@
     "name": "Docs Team",
     "description": "The Docs Team is responsible for maintaining and updating the PaperMC documentation. They ensure that the documentation is up-to-date and accurate, and that it's easy to understand for all users.",
     "members": [
+      {
+        "name": "Glare",
+        "avatar": "https://avatars.githubusercontent.com/u/21014720?v=4",
+        "discord": "glare",
+        "github": "darbyjack"
+      },
+      {
+        "name": "Ollie",
+        "avatar": "https://avatars.githubusercontent.com/u/69084614?v=4",
+        "discord": "ollieee_",
+        "github": "olijeffers0n"
+      },
       {
         "name": "Strokkur24",
         "avatar": "https://avatars.githubusercontent.com/u/133226102?v=4",