diff --git a/changelog.yml b/changelog.yml
index bf58de27b8..e8ed758f58 100644
--- a/changelog.yml
+++ b/changelog.yml
@@ -141,8 +141,17 @@ Components:
       Author: Cyberboss
       PullRequest: 1070
   Core:
+  - Version: 6.2.0
+    ComponentVersions: {}
+    Changes: []
+    Unreleased: true
+  - Version: 6.1.1
+    ComponentVersions: {}
+    Changes: []
+    Unreleased: true
   - Version: 6.1.0
     ComponentVersions:
+      Core: 6.1.0
       HttpApi: 10.0.0
       DreamMakerApi: 7.0.0
       Configuration: 5.0.0
@@ -151,34 +160,12 @@ Components:
       NugetCommon: 7.0.0
       NugetApi: 13.0.1
       NugetClient: 15.0.1
-      WebControlPanel: 5.3.0
+      WebControlPanel: 5.4.2
     Changes:
     - Descriptions:
       - Added the `EngineInstallComplete` event. Parameter is the engine version that was installed (This is also the name of the directory in the `Byond` instance folder).
       Author: Cyberboss
       PullRequest: 1758
-    Unreleased: true
-  - Version: 6.0.2
-    ComponentVersions:
-      HttpApi: 10.0.0
-      DreamMakerApi: 7.0.0
-      Configuration: 5.0.0
-      InteropApi: 5.7.0
-      HostWatchdog: 1.4.1
-      NugetCommon: 7.0.0
-      NugetApi: 13.0.1
-      NugetClient: 15.0.1
-      WebControlPanel: 5.3.0
-    Changes:
-    - Descriptions:
-      - Fixed health checks failing on OpenDream servers after a TGS restart.
-      - When game servers exit with code 0, chat bots will no longer call it a crash.
-      - Fixed homepage links to the app again.
-      - Removed size limit on `/Transfer` uploads.
-      - Reduced number of job updates per second sent over SignalR from 4 to 1.
-      Author: Cyberboss
-      PullRequest: 1757
-    Unreleased: true
   - Version: 6.0.1
     ComponentVersions:
       HttpApi: 10.0.0
@@ -3201,6 +3188,19 @@ Components:
       Author: AffectedArc07
       PullRequest: 1408
   WebControlPanel:
+  - Version: 5.4.2
+    Changes:
+    - Descriptions:
+      - Added support for quick setup from a branch.
+      - Updated implementation of `.tgs.yml` protocol to support different source paths for static files.
+      - Fixed updating major TGS versions.
+      - Fixed an issue with TGS changelog parsing.
+      - Fixed failed logins never reporting as such.
+      - Fix Discord OAuth requiring a `RedirectUrl` be specified in the TGS configuration.
+      - Fixed titling of Deployment card entries.
+      - Removed chat bot toggle for removed "Based on what meme?" functionality
+      Author: Cyberboss
+      PullRequest: 1759
   - Version: 5.3.0
     Changes:
     - Descriptions: