diff --git a/.github/workflows/generate-desktop-targets.yml b/.github/workflows/generate-desktop-targets.yml
index 5c03cc3f1f..990d43c316 100644
--- a/.github/workflows/generate-desktop-targets.yml
+++ b/.github/workflows/generate-desktop-targets.yml
@@ -24,7 +24,7 @@ defaults:
     shell: bash
 
 env:
-  FLEET_DESKTOP_VERSION: 1.24.0
+  FLEET_DESKTOP_VERSION: 1.25.0
 
 permissions:
   contents: read
diff --git a/orbit/CHANGELOG.md b/orbit/CHANGELOG.md
index 1db883b119..a4427bd7c2 100644
--- a/orbit/CHANGELOG.md
+++ b/orbit/CHANGELOG.md
@@ -1,8 +1,20 @@
+## Orbit 1.25.0 (May 22, 2024)
+
+* Added code to detect value of `DISPLAY` variable of user instead of defaulting to `:0` (to support Ubuntu 24.04 with Xorg).
+
+* Close idle connections every 55 minutes to prevent load balancers (like AWS ELB) from forcefully terminating long lived connections.
+
+* Add support for executing zsh scripts on macOS and Linux hosts
+
+* Windows orbit.exe and fleet-desktop.exe are now signed.
+
+* Added ability to install software when requested by the Fleet server. Note that this is disabled unless the package was built with the `--enable-scripts` flag.
+
 ## Orbit 1.24.0 (Apr 17, 2024)
 
 * Fixed script execution exit codes on windows by casting to signed integers to match windows interpreter.
 
-* In orbit_info table, added desktop_version and scripts_enabled fields.
+* In `orbit_info` table, added `desktop_version` and `scripts_enabled` fields.
 
 ## Orbit 1.23.0 (Apr 08, 2024)
 
diff --git a/orbit/changes/17187-sign-windows b/orbit/changes/17187-sign-windows
deleted file mode 100644
index b074822855..0000000000
--- a/orbit/changes/17187-sign-windows
+++ /dev/null
@@ -1 +0,0 @@
-Windows orbit.exe and fleet-desktop.exe are now signed.
diff --git a/orbit/changes/17321-zsh-support b/orbit/changes/17321-zsh-support
deleted file mode 100644
index 7b2c37455f..0000000000
--- a/orbit/changes/17321-zsh-support
+++ /dev/null
@@ -1 +0,0 @@
-* Add support for executing zsh scripts on macOS and Linux hosts
diff --git a/orbit/changes/18783-fleetd-cleanup-idle-conn-every-10m b/orbit/changes/18783-fleetd-cleanup-idle-conn-every-10m
deleted file mode 100644
index 1eeb93b96e..0000000000
--- a/orbit/changes/18783-fleetd-cleanup-idle-conn-every-10m
+++ /dev/null
@@ -1 +0,0 @@
-* Close idle connections every 10 minutes to prevent load balancers (like AWS ELB) from forcefully terminating long lived connections.
diff --git a/orbit/changes/18797-install-software b/orbit/changes/18797-install-software
deleted file mode 100644
index a372c8a173..0000000000
--- a/orbit/changes/18797-install-software
+++ /dev/null
@@ -1 +0,0 @@
-* Added ability to install software when requested by the Fleet server. Note that this is disabled unless the package was built with the `--enable-scripts` flag.
diff --git a/orbit/changes/18925-fleet-desktop-support-ubuntu-24.04-x11 b/orbit/changes/18925-fleet-desktop-support-ubuntu-24.04-x11
deleted file mode 100644
index acf781e91a..0000000000
--- a/orbit/changes/18925-fleet-desktop-support-ubuntu-24.04-x11
+++ /dev/null
@@ -1 +0,0 @@
-* Added code to detect value of `DISPLAY` variable of user instead of defaulting to `:0` (to support Ubuntu 24.04 with Xorg).
diff --git a/tools/tuf/download-artifacts/download-artifacts.go b/tools/tuf/download-artifacts/download-artifacts.go
index 2f0d333cff..b18d11515c 100644
--- a/tools/tuf/download-artifacts/download-artifacts.go
+++ b/tools/tuf/download-artifacts/download-artifacts.go
@@ -297,7 +297,7 @@ func downloadComponents(workflowName string, headBranch string, artifactNames ma
 			} else if *artifact.Name == artifactNames["windows"] {
 				urls["windows"] = *artifact.ArchiveDownloadURL
 			} else {
-				return fmt.Errorf("unknown artifact name: %s", *artifact.Name)
+				fmt.Printf("skipping artifact name: %q\n", *artifact.Name)
 			}
 		}
 		if len(urls) == 3 || !retry {