diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1e63c033eff..0fc2d7d3f10b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,72 @@
+## Fleet 4.61.0 (Dec 17, 2024)
+
+## Endpoint operations
+- Added support to require email verification (MFA) on each login when setting up a Fleet user outside SSO.
+- Extended Linux encryption key escrow support to Ubuntu 20.04.6.
+- Added missing APM instrumentation for Fleet API routes.
+- Improved label validation when running live queries. Previously, when passing label(s) that do not exist, the labels were ignored. Now, an error is returned indicating which labels were not found. This change affects both the API and `fleetctl query` command.
+
+## Device management (MDM)
+- Added functionality for creating an automatic install policy for Fleet-maintained apps.
+- Replaced Zoom Fleet-maintained app with Zoom for IT, which does not open any windows during installation.
+- Added support for the new `windows_migration_enabled` setting (can be set via `fleetctl`, the `PATCH /api/latest/fleet/config` API endpoint and the UI). Requires a premium license.
+- Updated to only show the "follow instructions on My device" banner for Linux hosts whose disks are encrypted but for which Fleet hasn't escrowed a valid key.
+- Added App Store app UI: Added different empty state when VPP token is not added at all vs. when it's not assigned to a team to prevent confusion.
+- Allowed APNS key to be in unencrypted PKCS8 format, which may happen when migrating from another MDM.
+- Allowed calling `/api/v1/fleet/software/fleet_maintained_apps` with no team ID to retrieve the full global list of maintained apps.
+- Added UI changes for windows MDM page and allow for automatic migration for windows hosts.
+- Bypassed the setup experience UI if there is no setup experience item to process (no software to install, no script to execute), so that releasing the device is done without going through that window.
+
+## Vulnerability management
+- Added `without_vulnerability_details` to software versions endpoint (/api/latest/fleet/software/versions) so CVE details can be truncated when on Fleet Premium.
+- Fixed an issue where the github cli software name was not matching against the cpe vulnerability name.
+
+## Bug fixes and improvements
+- Updated Go version to 1.23.4.
+- Update help text for policy automation Install software and run script modals.
+- Updated to display Windows MDM WSTEP flags in `fleet --help`.
+- Added language in email templates indicating that users should not reply to the automated emails.
+- Added better information on what deleting a host does.
+- Added a clearer error message when users attempt to turn MDM off on a Windows host.
+- Improved side nav empty state UI under `/settings`.
+- Added missing loading spinner for delete modals (delete configuration profile, delete script, delete setup script and delete software).
+- Improved performance of updating the `nano_enrollments.last_seen_at` timestamp of Apple MDM devices by an order of magnitude under load.
+- Improved MDM `SELECT FROM nano_enrollment_queue` MySQL query performance, including calling it on DB reader much of the time.
+- Updated Inter font to latest version for woff2 files.
+- Added better documentation around how the --label flag works in the fleetctl query command.
+- Switched Twitter logo to X logo in Fleet-initiated automated emails.
+- Removed duplicate indexes from the database schema..
+- Added cleanup job to delete stuck pending Apple profiles, and requeue them.
+- Exclude any custom sourced "users" from the host details "used by" display if Fleet doesn't have an email for them.
+- Replaced the internal use of the deprecated `go.mozilla.org/pkcs7` package with the maintained fork `github.com/smallstep/pkcs7`.
+- Switched email template font to Inter to match previous changes in the rest of the UI.
+- Updated resend config profile API from `hosts/[hostid}/configuration_profiles/resend/{uuid}` to `hosts/{hostid}/configuration_profiles/{uuid}/resend`.
+- Update nanomdm dependency with latest bug fixes and improvements.
+- Updated documentation to include `firefox_preferences` table for Linux and Windows platforms.
+- Restored the user's previous scroll, if any, when they change the filter on the host software table.
+- Updated a link in the Fleet-maintained apps UI to point to the correct place.
+- Removed image borders that are included in Apple's app store icons.
+- Redirect when user provides an invalid URL param for fleet-maintained software id.
+- Added additional statistics item for number of saved queries.
+- Fixed a bug where the name of the setup experience script was not showing up in the activity for that script execution.
+- Present a nicely formatted and more informative UI for log destination in two places.
+- Fixed bug in `fleetdm/fleetctl` docker image where the `build` directory does not exist when generating deb/rpm packages.
+- Fixed missing read permission for team maintainers and admins on Fleet maintained apps.
+- Fixed a bug that would add "Fleet" to activities where it shouldn't be.
+- Fixed ability to clear policy automation that empties webhook URL.
+- Fixes a bug with pagination in the profiles and scripts lists.
+- Fixed duplicate queries in query stats list in host details.
+- Fixed zip and dmg automations showing null platform for installer
+- Fixed a typo in the loading modal when adding a Fleet-maintained app.
+- Fixed UI bug where "Actions" dropdown on host software page included "Install" and "Uninstall" options for software that is not able to be installed via Fleet.
+- Fixed a bug where the HTTP client used for MDM APNs push notifications did not support using a configured proxy.
+- Fixed potential deadlocks when deploying Apple configuration profiles.
+- Fixed releasing a DEP-enrolled macOS device if mTLS is configured for `fleetd`.
+- Fixed learn more about JIT provisioning link.
+- Fixed an issue with the copy for the activity generated by viewing a locked macOS host's PIN.
+- Fixed breaking with gitops user role running `fleetctl gitops` command when MDM is enabled.
+- Fixed responsive styles for the ADM table.
+
 ## Fleet 4.60.1 (Dec 03, 2024)
 
 ### Bug fixes
diff --git a/changes/18539-font-bug b/changes/18539-font-bug
deleted file mode 100644
index 682746606853..000000000000
--- a/changes/18539-font-bug
+++ /dev/null
@@ -1 +0,0 @@
-* Update Inter font to latest version for woff2 files 
\ No newline at end of file
diff --git a/changes/19696-missing-instrumentation b/changes/19696-missing-instrumentation
deleted file mode 100644
index 43d10469fdb3..000000000000
--- a/changes/19696-missing-instrumentation
+++ /dev/null
@@ -1 +0,0 @@
-Added missing APM instrumentation for Fleet API routes.
diff --git a/changes/21340-improve-nano-enrollments-last-seen-at-update b/changes/21340-improve-nano-enrollments-last-seen-at-update
deleted file mode 100644
index 55a978a05b4f..000000000000
--- a/changes/21340-improve-nano-enrollments-last-seen-at-update
+++ /dev/null
@@ -1 +0,0 @@
-* Improve performance of updating the `nano_enrollments.last_seen_at` timestamp of Apple MDM devices by an order of magnitude under load.
diff --git a/changes/21795-resend-config-profile-api b/changes/21795-resend-config-profile-api
deleted file mode 100644
index 0612554c37c9..000000000000
--- a/changes/21795-resend-config-profile-api
+++ /dev/null
@@ -1 +0,0 @@
-* Update resend config profile API from hosts/[hostid}/configuration_profiles/resend/{uuid} to hosts/{hostid}/configuration_profiles/{uuid}/resend
\ No newline at end of file
diff --git a/changes/21908-replace-mozilla-pkcs7 b/changes/21908-replace-mozilla-pkcs7
deleted file mode 100644
index 65fc8d79bf5a..000000000000
--- a/changes/21908-replace-mozilla-pkcs7
+++ /dev/null
@@ -1 +0,0 @@
-* Replaced the internal use of the deprecated `go.mozilla.org/pkcs7` package with the maintained fork `github.com/smallstep/pkcs7`.
diff --git a/changes/21986-fix-to-abm-token-table-responsive b/changes/21986-fix-to-abm-token-table-responsive
deleted file mode 100644
index c2d626e410c4..000000000000
--- a/changes/21986-fix-to-abm-token-table-responsive
+++ /dev/null
@@ -1 +0,0 @@
-- fix responsive styles for the adm table
diff --git a/changes/22068-email-2fa b/changes/22068-email-2fa
deleted file mode 100644
index 444051b9c886..000000000000
--- a/changes/22068-email-2fa
+++ /dev/null
@@ -1 +0,0 @@
-* Allow requiring email verification (MFA) on each login when setting up a Fleet user outside SSO
\ No newline at end of file
diff --git a/changes/22078-do-not-reply b/changes/22078-do-not-reply
deleted file mode 100644
index aa9f8253afc9..000000000000
--- a/changes/22078-do-not-reply
+++ /dev/null
@@ -1 +0,0 @@
-* Add language in email templates indicating that users should not reply to the automated emails
\ No newline at end of file
diff --git a/changes/22078-x b/changes/22078-x
deleted file mode 100644
index d6fb5d404980..000000000000
--- a/changes/22078-x
+++ /dev/null
@@ -1 +0,0 @@
-* Switch Twitter logo to X logo in Fleet-initiated automated emails
\ No newline at end of file
diff --git a/changes/22527-policy-automation-ui-improvements b/changes/22527-policy-automation-ui-improvements
deleted file mode 100644
index 6d56f7efa646..000000000000
--- a/changes/22527-policy-automation-ui-improvements
+++ /dev/null
@@ -1 +0,0 @@
-- Update help text for policy automation Install software and Run script modals
diff --git a/changes/22819-delete-modal b/changes/22819-delete-modal
deleted file mode 100644
index a1dc4e5b610f..000000000000
--- a/changes/22819-delete-modal
+++ /dev/null
@@ -1 +0,0 @@
-- Fleet UI: Better information on what deleting a host does
diff --git a/changes/22896-ui-windows-automatic-migration b/changes/22896-ui-windows-automatic-migration
deleted file mode 100644
index ae0234123bfd..000000000000
--- a/changes/22896-ui-windows-automatic-migration
+++ /dev/null
@@ -1 +0,0 @@
-- add UI changes for windows mdm page and allow for automatic migration for windows hosts.
diff --git a/changes/22897-add-windows-migration-enabled-setting b/changes/22897-add-windows-migration-enabled-setting
deleted file mode 100644
index 15866a98c7af..000000000000
--- a/changes/22897-add-windows-migration-enabled-setting
+++ /dev/null
@@ -1 +0,0 @@
-* Added support for the new `windows_migration_enabled` setting (can be set via `fleetctl`, the `PATCH /api/latest/fleet/config` API endpoint and the UI). Requires a premium license.
diff --git a/changes/23020-automation-software-install-zip-dmg b/changes/23020-automation-software-install-zip-dmg
deleted file mode 100644
index 3b0af00e9742..000000000000
--- a/changes/23020-automation-software-install-zip-dmg
+++ /dev/null
@@ -1 +0,0 @@
-- Fix zip and dmg automations showing null platform for installer
diff --git a/changes/23027-settings-empty-states b/changes/23027-settings-empty-states
deleted file mode 100644
index ecc6736d0512..000000000000
--- a/changes/23027-settings-empty-states
+++ /dev/null
@@ -1 +0,0 @@
-* Improve side nav empty state UI under `/settings`
\ No newline at end of file
diff --git a/changes/23095-host-sw-scroll b/changes/23095-host-sw-scroll
deleted file mode 100644
index 6788c9f51119..000000000000
--- a/changes/23095-host-sw-scroll
+++ /dev/null
@@ -1 +0,0 @@
-- Restore the user's previous scroll, if any, when they change the filter on the host software table.
diff --git a/changes/23158-turn-off-windows-mdm-err b/changes/23158-turn-off-windows-mdm-err
deleted file mode 100644
index 4bc7d28c8eef..000000000000
--- a/changes/23158-turn-off-windows-mdm-err
+++ /dev/null
@@ -1 +0,0 @@
-- Adds a clearer error message when users attempt to turn MDM off on a Windows host.
\ No newline at end of file
diff --git a/changes/23234-bug-fix b/changes/23234-bug-fix
deleted file mode 100644
index c38071cd8188..000000000000
--- a/changes/23234-bug-fix
+++ /dev/null
@@ -1,2 +0,0 @@
-- Add App Store app UI: Added different empty state when VPP token is not added at all vs. when it's
-  not assigned to a team to prevent confusion.
diff --git a/changes/23305-team-admin-tma b/changes/23305-team-admin-tma
deleted file mode 100644
index 17b4bdeddb7f..000000000000
--- a/changes/23305-team-admin-tma
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed missing read permission for team maintainers and admins on Fleet maintained apps
diff --git a/changes/23404-pagination b/changes/23404-pagination
deleted file mode 100644
index 912714fb9d53..000000000000
--- a/changes/23404-pagination
+++ /dev/null
@@ -1 +0,0 @@
-- Fixes a bug with pagination in the profiles and scripts lists.
\ No newline at end of file
diff --git a/changes/23458-additional-stats b/changes/23458-additional-stats
deleted file mode 100644
index 73587d4def28..000000000000
--- a/changes/23458-additional-stats
+++ /dev/null
@@ -1 +0,0 @@
-- Added additional statistics item for number of saved queries
diff --git a/changes/23462-show-windows-mdm-wstep-options b/changes/23462-show-windows-mdm-wstep-options
deleted file mode 100644
index 8df6b9313946..000000000000
--- a/changes/23462-show-windows-mdm-wstep-options
+++ /dev/null
@@ -1 +0,0 @@
-- Display Windows MDM WSTEP flags in `fleet --help`.
diff --git a/changes/23488-host-duplicate-queries b/changes/23488-host-duplicate-queries
deleted file mode 100644
index 7aad235231ff..000000000000
--- a/changes/23488-host-duplicate-queries
+++ /dev/null
@@ -1 +0,0 @@
-* Fix duplicate queries in query stats list in host details
diff --git a/changes/23621-unlock-text b/changes/23621-unlock-text
deleted file mode 100644
index 6715062fdff8..000000000000
--- a/changes/23621-unlock-text
+++ /dev/null
@@ -1 +0,0 @@
-- Fixes an issue with the copy for the activity generated by viewing a locked macOS host's PIN.
\ No newline at end of file
diff --git a/changes/23679-optimize-software-versions b/changes/23679-optimize-software-versions
deleted file mode 100644
index 52eb3d7bd585..000000000000
--- a/changes/23679-optimize-software-versions
+++ /dev/null
@@ -1 +0,0 @@
-* Added `without_vulnerability_details` to software versions endpoint (/api/latest/fleet/software/versions) so CVE details can be truncated when on Fleet Premium
\ No newline at end of file
diff --git a/changes/23686-update-zoom b/changes/23686-update-zoom
deleted file mode 100644
index 5a4dace779c1..000000000000
--- a/changes/23686-update-zoom
+++ /dev/null
@@ -1,2 +0,0 @@
-- Replaces Zoom Fleet-maintained app with Zoom for IT, which does not open any windows during
-  installation.
\ No newline at end of file
diff --git a/changes/23733-apple-app-store-icons b/changes/23733-apple-app-store-icons
deleted file mode 100644
index f9b062ff8232..000000000000
--- a/changes/23733-apple-app-store-icons
+++ /dev/null
@@ -1 +0,0 @@
-- Fleet UI: Remove image borders that are included in Apple's app store icons
diff --git a/changes/23749-fix-learn-more-link b/changes/23749-fix-learn-more-link
deleted file mode 100644
index d10d50f7010a..000000000000
--- a/changes/23749-fix-learn-more-link
+++ /dev/null
@@ -1 +0,0 @@
-- Fleet UI: Fix learn more about JIT provisioning link
diff --git a/changes/23758-use-fleethttp-client-for-apns-push-notifications b/changes/23758-use-fleethttp-client-for-apns-push-notifications
deleted file mode 100644
index 08a6eebba689..000000000000
--- a/changes/23758-use-fleethttp-client-for-apns-push-notifications
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed a bug where the HTTP client used for MDM APNs push notifications did not support using a configured proxy.
diff --git a/changes/23760-pkcs8-apns-key b/changes/23760-pkcs8-apns-key
deleted file mode 100644
index b1e16cbf4cdf..000000000000
--- a/changes/23760-pkcs8-apns-key
+++ /dev/null
@@ -1 +0,0 @@
-Allow APNS key to be in unencrypted PKCS8 format, which may happen when migrating from another MDM.
diff --git a/changes/23787-script-name b/changes/23787-script-name
deleted file mode 100644
index af50855badf3..000000000000
--- a/changes/23787-script-name
+++ /dev/null
@@ -1,2 +0,0 @@
-- Fixes a bug where the name of the setup experience script was not showing up in the activity for
-  that script execution.
\ No newline at end of file
diff --git a/changes/23816-profile-stuck-pending b/changes/23816-profile-stuck-pending
deleted file mode 100644
index 92171e24afcb..000000000000
--- a/changes/23816-profile-stuck-pending
+++ /dev/null
@@ -1 +0,0 @@
-Added cleanup job to delete stuck pending Apple profiles, and requeue them.
diff --git a/changes/23832-select-nano_enrollment_queue b/changes/23832-select-nano_enrollment_queue
deleted file mode 100644
index 5ae116326e56..000000000000
--- a/changes/23832-select-nano_enrollment_queue
+++ /dev/null
@@ -1 +0,0 @@
-Improved MDM `SELECT FROM nano_enrollment_queue` MySQL query performance, including calling it on DB reader much of the time.
diff --git a/changes/23834-improve-label-flag-validation b/changes/23834-improve-label-flag-validation
deleted file mode 100644
index 5d8d8e4b0ac5..000000000000
--- a/changes/23834-improve-label-flag-validation
+++ /dev/null
@@ -1 +0,0 @@
-* Improved label validation when running live queries. Previously, when passing label(s) that do not exist, the labels were ignored. Now, an error is returned indicating which labels were not found. This change affects both the API and `fleetctl query` command.
\ No newline at end of file
diff --git a/changes/23880-fleet-ctl-label-docs b/changes/23880-fleet-ctl-label-docs
deleted file mode 100644
index 870b424a0550..000000000000
--- a/changes/23880-fleet-ctl-label-docs
+++ /dev/null
@@ -1 +0,0 @@
-* Added better documentation around how the --label flag works in the fleetctl query command.
\ No newline at end of file
diff --git a/changes/23893-fix-docker-fleetctl b/changes/23893-fix-docker-fleetctl
deleted file mode 100644
index 3d68bd2540b4..000000000000
--- a/changes/23893-fix-docker-fleetctl
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed bug in `fleetdm/fleetctl` docker image where the `build` directory does not exist when generating deb/rpm packages.
diff --git a/changes/23905-update-nanomdm b/changes/23905-update-nanomdm
deleted file mode 100644
index 5399590bdc9b..000000000000
--- a/changes/23905-update-nanomdm
+++ /dev/null
@@ -1 +0,0 @@
-Update nanomdm dependency with latest bug fixes and improvements.
diff --git a/changes/23942-wrong-link b/changes/23942-wrong-link
deleted file mode 100644
index f7ac16758264..000000000000
--- a/changes/23942-wrong-link
+++ /dev/null
@@ -1 +0,0 @@
-- Updates a link in the Fleet-maintained apps UI to point to the correct place.
\ No newline at end of file
diff --git a/changes/23967-doc-firefox_preferences-linux-windows b/changes/23967-doc-firefox_preferences-linux-windows
deleted file mode 100644
index 3faa0f6980c0..000000000000
--- a/changes/23967-doc-firefox_preferences-linux-windows
+++ /dev/null
@@ -1 +0,0 @@
-* doc: document firefox_preferences table for Linux and Windows platforms
diff --git a/changes/24009-gh-translation b/changes/24009-gh-translation
deleted file mode 100644
index 103bd7b6ebfc..000000000000
--- a/changes/24009-gh-translation
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed an issue where the github cli software name was not matching against the cpe vulnerability name
\ No newline at end of file
diff --git a/changes/24024-bypass-setup-experience-if-empty b/changes/24024-bypass-setup-experience-if-empty
deleted file mode 100644
index 319df88c1c91..000000000000
--- a/changes/24024-bypass-setup-experience-if-empty
+++ /dev/null
@@ -1,2 +0,0 @@
-* Bypass the setup experience UI if there is no setup experience item to process (no software to install, no script to execute), so that releasing the device is done without going through that window.
-* Fixed releasing a DEP-enrolled macOS device if mTLS is configured for `fleetd`.
diff --git a/changes/24093-clear-policy-automation b/changes/24093-clear-policy-automation
deleted file mode 100644
index 4d77791615e3..000000000000
--- a/changes/24093-clear-policy-automation
+++ /dev/null
@@ -1 +0,0 @@
-- Fleet UI: Fix ability to clear policy automation that empties webhook URL
diff --git a/changes/24109-drop-duplicate-indexes b/changes/24109-drop-duplicate-indexes
deleted file mode 100644
index df813981a494..000000000000
--- a/changes/24109-drop-duplicate-indexes
+++ /dev/null
@@ -1 +0,0 @@
-Removed duplicate indexes from the database schema.
diff --git a/changes/24186-fix-missing-spinner-for-delete-modal b/changes/24186-fix-missing-spinner-for-delete-modal
deleted file mode 100644
index eddc780a5ac5..000000000000
--- a/changes/24186-fix-missing-spinner-for-delete-modal
+++ /dev/null
@@ -1,2 +0,0 @@
-- Added missing loading spinner for delete modals (delete configuration profile, delete script,
-delete setup script and delete software).
\ No newline at end of file
diff --git a/changes/24248-host-details-encryption-banner b/changes/24248-host-details-encryption-banner
deleted file mode 100644
index 7de593417708..000000000000
--- a/changes/24248-host-details-encryption-banner
+++ /dev/null
@@ -1,2 +0,0 @@
-* Only show the "follow instructions on My device" banner for Linux hosts whose disks are encrypted
-but for which Fleet hasn't escrowed a valid key.
diff --git a/changes/24288-mdm-gitops-role b/changes/24288-mdm-gitops-role
deleted file mode 100644
index 2d04811311b2..000000000000
--- a/changes/24288-mdm-gitops-role
+++ /dev/null
@@ -1 +0,0 @@
-Fixed breaking with gitops user role running `fleetctl gitops` command when MDM is enabled.
diff --git a/changes/24321-exclude-custom-source-without-email b/changes/24321-exclude-custom-source-without-email
deleted file mode 100644
index f0c33e9c38a5..000000000000
--- a/changes/24321-exclude-custom-source-without-email
+++ /dev/null
@@ -1,2 +0,0 @@
-- Exclude any custom sourced "users" from the host details "used by" display if Fleet doesn't have
-  an email for them.
diff --git a/changes/24337-fix-activity b/changes/24337-fix-activity
deleted file mode 100644
index c29ac7c72ebf..000000000000
--- a/changes/24337-fix-activity
+++ /dev/null
@@ -1 +0,0 @@
-- Fixes a bug that would add "Fleet" to activities where it shouldn't be
\ No newline at end of file
diff --git a/changes/24363-fancy-log-destination b/changes/24363-fancy-log-destination
deleted file mode 100644
index 9f6a78448291..000000000000
--- a/changes/24363-fancy-log-destination
+++ /dev/null
@@ -1 +0,0 @@
-* Present a nicely formatted and more informative UI for log destination in two places.
diff --git a/changes/24487-host-software-actions b/changes/24487-host-software-actions
deleted file mode 100644
index f98664612aff..000000000000
--- a/changes/24487-host-software-actions
+++ /dev/null
@@ -1,2 +0,0 @@
-- Fixed UI bug where "Actions" dropdown on host software page included "Install" and "Uninstall"
-  options for software that is not able to be installed via Fleet.
diff --git a/changes/24509-fma-no-team b/changes/24509-fma-no-team
deleted file mode 100644
index 64fa83bc92a0..000000000000
--- a/changes/24509-fma-no-team
+++ /dev/null
@@ -1 +0,0 @@
-* Allowed calling `/api/v1/fleet/software/fleet_maintained_apps` with no team ID to retrieve the full global list of maintained apps
diff --git a/changes/24636-UI-redirect-for-invalid-url-param b/changes/24636-UI-redirect-for-invalid-url-param
deleted file mode 100644
index 6bd50ab9abaf..000000000000
--- a/changes/24636-UI-redirect-for-invalid-url-param
+++ /dev/null
@@ -1 +0,0 @@
-* Redirect when user provides an invalid URL param for fleet-maintained software id
diff --git a/changes/24771-mdm-deadlock-fixes b/changes/24771-mdm-deadlock-fixes
deleted file mode 100644
index 708576683328..000000000000
--- a/changes/24771-mdm-deadlock-fixes
+++ /dev/null
@@ -1 +0,0 @@
-Fixed potential deadlocks when deploying Apple configuration profiles.
diff --git a/changes/email-font-inter b/changes/email-font-inter
deleted file mode 100644
index b7700d58c273..000000000000
--- a/changes/email-font-inter
+++ /dev/null
@@ -1 +0,0 @@
-* Switched email template font to Inter to match previous changes in the rest of the UI
\ No newline at end of file
diff --git a/changes/feat-ui-creat-policies-fleet-apps-title-details b/changes/feat-ui-creat-policies-fleet-apps-title-details
deleted file mode 100644
index e69ff76e1852..000000000000
--- a/changes/feat-ui-creat-policies-fleet-apps-title-details
+++ /dev/null
@@ -1 +0,0 @@
-- Adds functionality for creating an automatic install policy for Fleet-maintained apps
\ No newline at end of file
diff --git a/changes/jve-fix-typo b/changes/jve-fix-typo
deleted file mode 100644
index 79379dadc57b..000000000000
--- a/changes/jve-fix-typo
+++ /dev/null
@@ -1 +0,0 @@
-- Fixes a typo in the loading modal when adding a Fleet-maintained app.
\ No newline at end of file
diff --git a/changes/update-go1.23.4 b/changes/update-go1.23.4
deleted file mode 100644
index 15f4d16b9457..000000000000
--- a/changes/update-go1.23.4
+++ /dev/null
@@ -1 +0,0 @@
-* Updated Go version to 1.23.4
diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml
index 5ddc8cd5629e..61271d32dc29 100644
--- a/charts/fleet/Chart.yaml
+++ b/charts/fleet/Chart.yaml
@@ -4,11 +4,11 @@ name: fleet
 keywords:
   - fleet
   - osquery
-version: v6.2.4
+version: v6.2.5
 home: https://github.com/fleetdm/fleet
 sources:
   - https://github.com/fleetdm/fleet.git
-appVersion: v4.60.1
+appVersion: v4.61.0
 dependencies:
   - name: mysql
     condition: mysql.enabled
diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml
index e8570a7d600a..fef73ac1d66f 100644
--- a/charts/fleet/values.yaml
+++ b/charts/fleet/values.yaml
@@ -3,7 +3,7 @@
 hostName: fleet.localhost
 replicas: 3 # The number of Fleet instances to deploy
 imageRepository: fleetdm/fleet
-imageTag: v4.60.1 # Version of Fleet to deploy
+imageTag: v4.61.0 # Version of Fleet to deploy
 podAnnotations: {} # Additional annotations to add to the Fleet pod
 serviceAccountAnnotations: {} # Additional annotations to add to the Fleet service account
 resources:
diff --git a/infrastructure/dogfood/terraform/aws/variables.tf b/infrastructure/dogfood/terraform/aws/variables.tf
index 896e7474e727..922b0aca5b1b 100644
--- a/infrastructure/dogfood/terraform/aws/variables.tf
+++ b/infrastructure/dogfood/terraform/aws/variables.tf
@@ -56,7 +56,7 @@ variable "database_name" {
 
 variable "fleet_image" {
   description = "the name of the container image to run"
-  default     = "fleetdm/fleet:v4.60.1"
+  default     = "fleetdm/fleet:v4.61.0"
 }
 
 variable "software_inventory" {
diff --git a/infrastructure/dogfood/terraform/gcp/variables.tf b/infrastructure/dogfood/terraform/gcp/variables.tf
index eb0391b392d4..ad04cc135115 100644
--- a/infrastructure/dogfood/terraform/gcp/variables.tf
+++ b/infrastructure/dogfood/terraform/gcp/variables.tf
@@ -68,7 +68,7 @@ variable "redis_mem" {
 }
 
 variable "image" {
-  default = "fleetdm/fleet:v4.60.1"
+  default = "fleetdm/fleet:v4.61.0"
 }
 
 variable "software_installers_bucket_name" {
diff --git a/infrastructure/guardduty/.terraform.lock.hcl b/infrastructure/guardduty/.terraform.lock.hcl
index 1f3b9a6b8471..7f09debdb20c 100644
--- a/infrastructure/guardduty/.terraform.lock.hcl
+++ b/infrastructure/guardduty/.terraform.lock.hcl
@@ -2,8 +2,8 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/aws" {
-  version     = "4.60.1"
-  constraints = ">= 3.0.0, >= 4.8.0, >= 4.9.0, ~> 4.60.1"
+  version     = "4.61.0"
+  constraints = ">= 3.0.0, >= 4.8.0, >= 4.9.0, ~> 4.61.0"
   hashes = [
     "h1:fuIdjl9f2JEH0TLoq5kc9NIPbJAAV7YBbZ8fvNp5XSg=",
     "zh:0341a460210463a0bebd5c12ce13dc49bd8cae2399b215418c5efa607fed84e4",
diff --git a/infrastructure/guardduty/main.tf b/infrastructure/guardduty/main.tf
index a68123626f23..da8fefa70b8e 100644
--- a/infrastructure/guardduty/main.tf
+++ b/infrastructure/guardduty/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.60.1"
+      version = "~> 4.61.0"
     }
   }
   backend "s3" {
diff --git a/infrastructure/infrastructure/cloudtrail/main.tf b/infrastructure/infrastructure/cloudtrail/main.tf
index a8232723e7c5..f5060a07307a 100644
--- a/infrastructure/infrastructure/cloudtrail/main.tf
+++ b/infrastructure/infrastructure/cloudtrail/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.60.1"
+      version = "~> 4.61.0"
     }
   }
   backend "s3" {
diff --git a/infrastructure/infrastructure/elastic-agent/.terraform.lock.hcl b/infrastructure/infrastructure/elastic-agent/.terraform.lock.hcl
index 3bf60fe7cc31..88f28475952a 100644
--- a/infrastructure/infrastructure/elastic-agent/.terraform.lock.hcl
+++ b/infrastructure/infrastructure/elastic-agent/.terraform.lock.hcl
@@ -2,8 +2,8 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/aws" {
-  version     = "4.60.1"
-  constraints = ">= 3.63.0, ~> 4.60.1"
+  version     = "4.61.0"
+  constraints = ">= 3.63.0, ~> 4.61.0"
   hashes = [
     "h1:fuIdjl9f2JEH0TLoq5kc9NIPbJAAV7YBbZ8fvNp5XSg=",
     "zh:0341a460210463a0bebd5c12ce13dc49bd8cae2399b215418c5efa607fed84e4",
diff --git a/infrastructure/infrastructure/elastic-agent/main.tf b/infrastructure/infrastructure/elastic-agent/main.tf
index 383fd562cfb2..fdaa05002c8d 100644
--- a/infrastructure/infrastructure/elastic-agent/main.tf
+++ b/infrastructure/infrastructure/elastic-agent/main.tf
@@ -20,7 +20,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.60.1"
+      version = "~> 4.61.0"
     }
   }
   backend "s3" {
diff --git a/infrastructure/infrastructure/guardduty-alerts/.terraform.lock.hcl b/infrastructure/infrastructure/guardduty-alerts/.terraform.lock.hcl
index 1f3b9a6b8471..7f09debdb20c 100644
--- a/infrastructure/infrastructure/guardduty-alerts/.terraform.lock.hcl
+++ b/infrastructure/infrastructure/guardduty-alerts/.terraform.lock.hcl
@@ -2,8 +2,8 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/aws" {
-  version     = "4.60.1"
-  constraints = ">= 3.0.0, >= 4.8.0, >= 4.9.0, ~> 4.60.1"
+  version     = "4.61.0"
+  constraints = ">= 3.0.0, >= 4.8.0, >= 4.9.0, ~> 4.61.0"
   hashes = [
     "h1:fuIdjl9f2JEH0TLoq5kc9NIPbJAAV7YBbZ8fvNp5XSg=",
     "zh:0341a460210463a0bebd5c12ce13dc49bd8cae2399b215418c5efa607fed84e4",
diff --git a/infrastructure/infrastructure/guardduty-alerts/main.tf b/infrastructure/infrastructure/guardduty-alerts/main.tf
index d39ad9e1817b..57e1adadc22b 100644
--- a/infrastructure/infrastructure/guardduty-alerts/main.tf
+++ b/infrastructure/infrastructure/guardduty-alerts/main.tf
@@ -15,7 +15,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.60.1"
+      version = "~> 4.61.0"
     }
   }
   backend "s3" {
diff --git a/infrastructure/infrastructure/spend_alerts/main.tf b/infrastructure/infrastructure/spend_alerts/main.tf
index 203822163486..ed97ff3476c8 100644
--- a/infrastructure/infrastructure/spend_alerts/main.tf
+++ b/infrastructure/infrastructure/spend_alerts/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.60.1"
+      version = "~> 4.61.0"
     }
   }
   backend "s3" {
diff --git a/terraform/addons/ses/README.md b/terraform/addons/ses/README.md
index bf74e252eabf..9e0d0c3cc6eb 100644
--- a/terraform/addons/ses/README.md
+++ b/terraform/addons/ses/README.md
@@ -9,7 +9,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.60.1 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.61.0 |
 
 ## Modules
 
diff --git a/terraform/addons/vuln-processing/variables.tf b/terraform/addons/vuln-processing/variables.tf
index b1c9aec6bd79..d9fd4e46fa58 100644
--- a/terraform/addons/vuln-processing/variables.tf
+++ b/terraform/addons/vuln-processing/variables.tf
@@ -24,7 +24,7 @@ variable "fleet_config" {
     vuln_processing_cpu                  = optional(number, 2048)
     vuln_data_stream_mem                 = optional(number, 1024)
     vuln_data_stream_cpu                 = optional(number, 512)
-    image                                = optional(string, "fleetdm/fleet:v4.60.1")
+    image                                = optional(string, "fleetdm/fleet:v4.61.0")
     family                               = optional(string, "fleet-vuln-processing")
     sidecars                             = optional(list(any), [])
     extra_environment_variables          = optional(map(string), {})
@@ -82,7 +82,7 @@ variable "fleet_config" {
     vuln_processing_cpu                  = 2048
     vuln_data_stream_mem                 = 1024
     vuln_data_stream_cpu                 = 512
-    image                                = "fleetdm/fleet:v4.60.1"
+    image                                = "fleetdm/fleet:v4.61.0"
     family                               = "fleet-vuln-processing"
     sidecars                             = []
     extra_environment_variables          = {}
diff --git a/terraform/byo-vpc/byo-db/README.md b/terraform/byo-vpc/byo-db/README.md
index ae4f596bbb88..14ea8baf47a2 100644
--- a/terraform/byo-vpc/byo-db/README.md
+++ b/terraform/byo-vpc/byo-db/README.md
@@ -6,7 +6,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.60.1 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.61.0 |
 
 ## Modules
 
diff --git a/terraform/byo-vpc/byo-db/byo-ecs/variables.tf b/terraform/byo-vpc/byo-db/byo-ecs/variables.tf
index ddebead667f6..73477bd34afd 100644
--- a/terraform/byo-vpc/byo-db/byo-ecs/variables.tf
+++ b/terraform/byo-vpc/byo-db/byo-ecs/variables.tf
@@ -16,7 +16,7 @@ variable "fleet_config" {
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
     pid_mode                     = optional(string, null)
-    image                        = optional(string, "fleetdm/fleet:v4.60.1")
+    image                        = optional(string, "fleetdm/fleet:v4.61.0")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
@@ -119,7 +119,7 @@ variable "fleet_config" {
     mem                          = 512
     cpu                          = 256
     pid_mode                     = null
-    image                        = "fleetdm/fleet:v4.60.1"
+    image                        = "fleetdm/fleet:v4.61.0"
     family                       = "fleet"
     sidecars                     = []
     depends_on                   = []
diff --git a/terraform/byo-vpc/byo-db/variables.tf b/terraform/byo-vpc/byo-db/variables.tf
index 13187e7069ac..38fffa6e7ba4 100644
--- a/terraform/byo-vpc/byo-db/variables.tf
+++ b/terraform/byo-vpc/byo-db/variables.tf
@@ -77,7 +77,7 @@ variable "fleet_config" {
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
     pid_mode                     = optional(string, null)
-    image                        = optional(string, "fleetdm/fleet:v4.60.1")
+    image                        = optional(string, "fleetdm/fleet:v4.61.0")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
@@ -205,7 +205,7 @@ variable "fleet_config" {
     mem                          = 512
     cpu                          = 256
     pid_mode                     = null
-    image                        = "fleetdm/fleet:v4.60.1"
+    image                        = "fleetdm/fleet:v4.61.0"
     family                       = "fleet"
     sidecars                     = []
     depends_on                   = []
diff --git a/terraform/byo-vpc/example/main.tf b/terraform/byo-vpc/example/main.tf
index 4acb7e7be87d..4e147d5ada2f 100644
--- a/terraform/byo-vpc/example/main.tf
+++ b/terraform/byo-vpc/example/main.tf
@@ -17,7 +17,7 @@ provider "aws" {
 }
 
 locals {
-  fleet_image = "fleetdm/fleet:v4.60.1"
+  fleet_image = "fleetdm/fleet:v4.61.0"
   domain_name = "example.com"
 }
 
diff --git a/terraform/byo-vpc/variables.tf b/terraform/byo-vpc/variables.tf
index e31a0265be59..415ec25710f7 100644
--- a/terraform/byo-vpc/variables.tf
+++ b/terraform/byo-vpc/variables.tf
@@ -170,7 +170,7 @@ variable "fleet_config" {
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
     pid_mode                     = optional(string, null)
-    image                        = optional(string, "fleetdm/fleet:v4.60.1")
+    image                        = optional(string, "fleetdm/fleet:v4.61.0")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
@@ -298,7 +298,7 @@ variable "fleet_config" {
     mem                          = 512
     cpu                          = 256
     pid_mode                     = null
-    image                        = "fleetdm/fleet:v4.60.1"
+    image                        = "fleetdm/fleet:v4.61.0"
     family                       = "fleet"
     sidecars                     = []
     depends_on                   = []
diff --git a/terraform/example/main.tf b/terraform/example/main.tf
index 245d2744db20..e5355fd09f76 100644
--- a/terraform/example/main.tf
+++ b/terraform/example/main.tf
@@ -63,8 +63,8 @@ module "fleet" {
 
   fleet_config = {
     # To avoid pull-rate limiting from dockerhub, consider using our quay.io mirror
-    # for the Fleet image. e.g. "quay.io/fleetdm/fleet:v4.60.1"
-    image = "fleetdm/fleet:v4.60.1" # override default to deploy the image you desire
+    # for the Fleet image. e.g. "quay.io/fleetdm/fleet:v4.61.0"
+    image = "fleetdm/fleet:v4.61.0" # override default to deploy the image you desire
     # See https://fleetdm.com/docs/deploy/reference-architectures#aws for appropriate scaling
     # memory and cpu.
     autoscaling = {
diff --git a/terraform/variables.tf b/terraform/variables.tf
index fcf0f4b4f48e..f3722ca3de75 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -218,7 +218,7 @@ variable "fleet_config" {
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
     pid_mode                     = optional(string, null)
-    image                        = optional(string, "fleetdm/fleet:v4.60.1")
+    image                        = optional(string, "fleetdm/fleet:v4.61.0")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
@@ -346,7 +346,7 @@ variable "fleet_config" {
     mem                          = 512
     cpu                          = 256
     pid_mode                     = null
-    image                        = "fleetdm/fleet:v4.60.1"
+    image                        = "fleetdm/fleet:v4.61.0"
     family                       = "fleet"
     sidecars                     = []
     depends_on                   = []
diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json
index 9ca552068b9d..e342b214dd23 100644
--- a/tools/fleetctl-npm/package.json
+++ b/tools/fleetctl-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleetctl",
-  "version": "v4.60.1",
+  "version": "v4.61.0",
   "description": "Installer for the fleetctl CLI tool",
   "bin": {
     "fleetctl": "./run.js"