diff --git a/CHANGELOG.md b/CHANGELOG.md
index f54b235989..b05ac75800 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+## Fleet 4.21.0 (Sep 28, 2022)
+
+* Fleet Premium: Added the ability to know how many hosts and which hosts, on a team, are failing a global policy.
+
+* Added validation to the `config` and `teams` configuration files. Fleet can be managed with [configuration files (YAML syntax)](https://fleetdm.com/docs/using-fleet/configuration-files) and the fleetctl command line tool. 
+
+* Added the ability to manage osquery flags remotely. This requires [Orbit, Fleet's agent manager](https://fleetdm.com/announcements/introducing-orbit-your-fleet-agent-manager). If at some point you revoked an old enroll secret, this feature won't work for hosts that were added to Fleet using this old enroll secret. To manage osquery flags on these hosts, we recommend deploying a new package. Check out the instructions [here on GitHub](https://github.com/fleetdm/fleet/issues/7377).
+
+* Added a `/api/v1/fleet/device/{token}/desktop` API route that returns only the number of failing policies for a specific host.
+
+* Added support for kubequery.
+
+* Added support for an `AC_TEAM_ID` environment variable when creating [signed installers for macOS hosts](https://fleetdm.com/docs/using-fleet/adding-hosts#signing-installers).
+
+* Made cards on the **Home** page clickable.
+
+* Added es_process_file_events, password_policy, and windows_update_history tables to osquery.
+
+* Added activity items to capture when, and by who, agent options are edited.
+
+* Added logging to capture the user’s email upon successful login.
+
+* Increased the size of placeholder text from extra small to small.
+
+* Fixed an error that cleared the form when adding a new integration.
+
+* Fixed an error generating Windows packages with the fleetctl package on non-English localizations of Windows.
+
+* Fixed a bug that showed the small screen overlay when trying to print.
+
+* Fixed the UI bug that caused the label filter dropdown to go under the table header.
+
+* Fixed side panel tooltips to not be wider than side panel causing scroll bug.
+
+
 ## Fleet 4.20.1 (Sep 15, 2022)
 
 **This is a security release.**
diff --git a/changes/5065-fleetctl-package-language b/changes/5065-fleetctl-package-language
deleted file mode 100644
index 2fcc0897ec..0000000000
--- a/changes/5065-fleetctl-package-language
+++ /dev/null
@@ -1 +0,0 @@
-* Fix an error generating Windows packages with `fleetctl package` on non-English localizations of Windows.
diff --git a/changes/bug-7752-save-host-status-webhook b/changes/bug-7752-save-host-status-webhook
deleted file mode 100644
index 1a1e4e415d..0000000000
--- a/changes/bug-7752-save-host-status-webhook
+++ /dev/null
@@ -1 +0,0 @@
-* Users cannot save host status webhook without choosing required  percent of hosts and days count in the app settings page
\ No newline at end of file
diff --git a/changes/bug-7818-fix-side-panel-tooltip-horizontal-scroll b/changes/bug-7818-fix-side-panel-tooltip-horizontal-scroll
deleted file mode 100644
index 00494ef10a..0000000000
--- a/changes/bug-7818-fix-side-panel-tooltip-horizontal-scroll
+++ /dev/null
@@ -1 +0,0 @@
-* Fix side panel tooltips to not be wider than side panel causing scroll bug
\ No newline at end of file
diff --git a/changes/bug-7843-integration-error-does-not-clear-form b/changes/bug-7843-integration-error-does-not-clear-form
deleted file mode 100644
index b8452eed62..0000000000
--- a/changes/bug-7843-integration-error-does-not-clear-form
+++ /dev/null
@@ -1 +0,0 @@
-* Fix error in adding a new integration to not clear form
\ No newline at end of file
diff --git a/changes/bug-7941-can-print-app b/changes/bug-7941-can-print-app
deleted file mode 100644
index 3f06c1a872..0000000000
--- a/changes/bug-7941-can-print-app
+++ /dev/null
@@ -1 +0,0 @@
-* Fixes bug which small screen overlay is shown when trying to print
\ No newline at end of file
diff --git a/changes/dogfood-mysql8 b/changes/dogfood-mysql8
deleted file mode 100644
index 48f0425a7b..0000000000
--- a/changes/dogfood-mysql8
+++ /dev/null
@@ -1 +0,0 @@
-- Update dogfood mysql to mysql8. Customer consumers of dogfood should upgrade by taking a snapshot of their database, and restoring it to a new database via the snapshot_identifier parameter.
diff --git a/changes/feature-6581-remote-flags-manaement-with-orbit b/changes/feature-6581-remote-flags-manaement-with-orbit
deleted file mode 100644
index 28bfc21f2d..0000000000
--- a/changes/feature-6581-remote-flags-manaement-with-orbit
+++ /dev/null
@@ -1,21 +0,0 @@
-* Orbit allows configuring osquery startup flags from Fleet, see [#7377](https://github.com/fleetdm/fleet/issues/7377).
-
-Important note for existing deployments that use Orbit: 
-This feature requires Orbit to communicate with Fleet. Orbit uses osquery's enroll secret to authenticate and enroll to Fleet.
-On environments where an enroll secret has been revoked, Orbit hosts that were deployed with such secret will fail to enroll to Fleet.
-This is not a regression, all existing features should work as expected, but we recommend to fix this issue given that we will be adding
-more features to Orbit that will use the new communication channel.
-
-## Solution 1 (generate new packages)
-
-1. To determine which hosts need to be fixed, run the following query: `SELECT * FROM orbit_info WHERE enrolled = false`.
-Hosts not running Orbit will fail to execute such query because the table doesn't exist, those can be ignored.
-2. Generate Orbit packages with the new enroll secret.
-3. Deploy Orbit packages to the hosts returned in (1).
-
-## Deploy new secret
-
-Alternatively, instead of generating new packages, the administrator can push the new enroll secret to hosts with revoked enroll secrets:
-- macOS: Push new secret to `/opt/orbit/secret.txt`.
-- Windows: Push new secret to `C:\Program Files\Orbit\secret.txt`.
-- Linux: Update the new secret set in the configuration file `/etc/default/orbit`.
diff --git a/changes/feature-7084-ee-fleet-desktop-endpoint b/changes/feature-7084-ee-fleet-desktop-endpoint
deleted file mode 100644
index 2ee099abb7..0000000000
--- a/changes/feature-7084-ee-fleet-desktop-endpoint
+++ /dev/null
@@ -1,2 +0,0 @@
-Added new EE endpoint at '/api/_version_/fleet/device/{token}/desktop' to be used by Fleet Desktop
-to get the number of failing policies.
\ No newline at end of file
diff --git a/changes/feature-7307-summary-tiles-clickable b/changes/feature-7307-summary-tiles-clickable
deleted file mode 100644
index d9659b69d9..0000000000
--- a/changes/feature-7307-summary-tiles-clickable
+++ /dev/null
@@ -1 +0,0 @@
-* Dashboard summary tiles now clickable
\ No newline at end of file
diff --git a/changes/feature-7394-generate-msrc-artifacts b/changes/feature-7394-generate-msrc-artifacts
deleted file mode 100644
index 827aa8931e..0000000000
--- a/changes/feature-7394-generate-msrc-artifacts
+++ /dev/null
@@ -1 +0,0 @@
-Use MSRC parser to generate security bulletin artifacts to be used for detecting Windows OS vulnerabilities.
\ No newline at end of file
diff --git a/changes/issue-5222-validate-config b/changes/issue-5222-validate-config
deleted file mode 100644
index 7e0293bee4..0000000000
--- a/changes/issue-5222-validate-config
+++ /dev/null
@@ -1 +0,0 @@
-* Added validation to raise errors if unknown keys or invalid values are passed to update the organization settings (including the agent options) or the team's agent options.
diff --git a/changes/issue-6981-keep-policy-filter-across-team-changes b/changes/issue-6981-keep-policy-filter-across-team-changes
deleted file mode 100644
index 29394340d0..0000000000
--- a/changes/issue-6981-keep-policy-filter-across-team-changes
+++ /dev/null
@@ -1 +0,0 @@
-- keep policy filter on Manage Hosts Page changes across a team changes
diff --git a/changes/issue-7065-indicate-hoverable-text b/changes/issue-7065-indicate-hoverable-text
deleted file mode 100644
index eae340a3db..0000000000
--- a/changes/issue-7065-indicate-hoverable-text
+++ /dev/null
@@ -1 +0,0 @@
-* Indicate hoverable text on host details/ device user details
\ No newline at end of file
diff --git a/changes/issue-7130-native-notarization-retry b/changes/issue-7130-native-notarization-retry
deleted file mode 100644
index ee64971d6b..0000000000
--- a/changes/issue-7130-native-notarization-retry
+++ /dev/null
@@ -1 +0,0 @@
-* Added logic to retry notarization and codesigning when using `FLEETCTL_NATIVE_TOOLING`
diff --git a/changes/issue-7143-add-activity-text-for-edit-agent-options b/changes/issue-7143-add-activity-text-for-edit-agent-options
deleted file mode 100644
index 3cf0e5db13..0000000000
--- a/changes/issue-7143-add-activity-text-for-edit-agent-options
+++ /dev/null
@@ -1 +0,0 @@
-- adds a custom activity details text for edit agent options for global and team contexts.
diff --git a/changes/issue-7591-add-low-disk-space-count b/changes/issue-7591-add-low-disk-space-count
deleted file mode 100644
index 517569a6f2..0000000000
--- a/changes/issue-7591-add-low-disk-space-count
+++ /dev/null
@@ -1 +0,0 @@
-* Added `low_disk_space_count` field to the `GET /host_summary` endpoint response that returns the number of hosts with less disk space available than the `low_disk_space` number provided as query parameter, available in Fleet Premium.
diff --git a/changes/issue-7592-add-low-disk-space-filter b/changes/issue-7592-add-low-disk-space-filter
deleted file mode 100644
index 3511f791db..0000000000
--- a/changes/issue-7592-add-low-disk-space-filter
+++ /dev/null
@@ -1 +0,0 @@
-* Added option to filter hosts by low available disk space.
diff --git a/changes/issue-7816-update-fleet-copy-of-osquery-tables b/changes/issue-7816-update-fleet-copy-of-osquery-tables
deleted file mode 100644
index 024376209b..0000000000
--- a/changes/issue-7816-update-fleet-copy-of-osquery-tables
+++ /dev/null
@@ -1 +0,0 @@
-* Add es_process_file_events, password_policy and windows_update_history to osquery tables
diff --git a/changes/issue-7819-placeholder-text b/changes/issue-7819-placeholder-text
deleted file mode 100644
index 4537955d1d..0000000000
--- a/changes/issue-7819-placeholder-text
+++ /dev/null
@@ -1 +0,0 @@
-* Placeholder text size small not extra small
\ No newline at end of file
diff --git a/changes/issue-7871-update-osquery-validations-to-5.5.1 b/changes/issue-7871-update-osquery-validations-to-5.5.1
deleted file mode 100644
index bb729bcf0c..0000000000
--- a/changes/issue-7871-update-osquery-validations-to-5.5.1
+++ /dev/null
@@ -1 +0,0 @@
-* Updated team and organization settings' "agent options" validations from osquery 5.4.0 to osquery 5.5.1.
diff --git a/changes/issue-7888-login-logs b/changes/issue-7888-login-logs
deleted file mode 100644
index 8fe1be9580..0000000000
--- a/changes/issue-7888-login-logs
+++ /dev/null
@@ -1 +0,0 @@
-* Added logging to capture user email upon successful login
\ No newline at end of file
diff --git a/changes/issue-7888-sso-login-log b/changes/issue-7888-sso-login-log
deleted file mode 100644
index 4263344652..0000000000
--- a/changes/issue-7888-sso-login-log
+++ /dev/null
@@ -1 +0,0 @@
-* Added logging to capture user email upon successful SSO login
\ No newline at end of file
diff --git a/changes/issue-7917-fix-z-index-and-add-no-custom-labels-state b/changes/issue-7917-fix-z-index-and-add-no-custom-labels-state
deleted file mode 100644
index 51970a5729..0000000000
--- a/changes/issue-7917-fix-z-index-and-add-no-custom-labels-state
+++ /dev/null
@@ -1 +0,0 @@
-- This fixes the UI bug where the label filter dropdown goes under the table header and add a "no custom labels" state that shows when the user has not created any custom labels yet.
diff --git a/changes/issue-7931-fix-sso-form-by-adding-trimming b/changes/issue-7931-fix-sso-form-by-adding-trimming
deleted file mode 100644
index 8596f11659..0000000000
--- a/changes/issue-7931-fix-sso-form-by-adding-trimming
+++ /dev/null
@@ -1,2 +0,0 @@
-- update SSO form values in Fleet UI so that they are trimmed before being sent to the server and
-  show UI error when sso login fails
diff --git a/changes/issue-7997-better-agent-options-error b/changes/issue-7997-better-agent-options-error
deleted file mode 100644
index 8078104769..0000000000
--- a/changes/issue-7997-better-agent-options-error
+++ /dev/null
@@ -1 +0,0 @@
-* Global agent options renders backend errors in UI
\ No newline at end of file
diff --git a/changes/kubequery b/changes/kubequery
deleted file mode 100644
index 31ac06b34d..0000000000
--- a/changes/kubequery
+++ /dev/null
@@ -1 +0,0 @@
-* Add support for [kubequery](https://github.com/Uptycs/kubequery).
diff --git a/changes/notarization-team-id b/changes/notarization-team-id
deleted file mode 100644
index 0e78a093ab..0000000000
--- a/changes/notarization-team-id
+++ /dev/null
@@ -1 +0,0 @@
-* Add support for Apple Team ID in Notarization workflows via `AC_TEAM_ID` environment variable.
diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml
index 5d0ff137bd..10e5492530 100644
--- a/charts/fleet/Chart.yaml
+++ b/charts/fleet/Chart.yaml
@@ -4,9 +4,9 @@ name: fleet
 keywords:
   - fleet
   - osquery
-version: v4.20.1
+version: v4.21.0
 home: https://github.com/fleetdm/fleet
 sources:
   - https://github.com/fleetdm/fleet.git
-appVersion: v4.20.1
+appVersion: v4.21.0
 
diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml
index cfb6cc0cf5..1f98a8064c 100644
--- a/charts/fleet/values.yaml
+++ b/charts/fleet/values.yaml
@@ -2,7 +2,7 @@
 # All settings related to how Fleet is deployed in Kubernetes
 hostName: fleet.localhost
 replicas: 3 # The number of Fleet instances to deploy
-imageTag: v4.20.1 # Version of Fleet to deploy
+imageTag: v4.21.0 # Version of Fleet to deploy
 createIngress: true # Whether or not to automatically create an Ingress
 ingressAnnotations: {} # Additional annotation to add to the Ingress
 podAnnotations: {} # Additional annotations to add to the Fleet pod
diff --git a/docs/Deploying/Server-Installation.md b/docs/Deploying/Server-Installation.md
index b78a0b72d2..fb07ffd0f0 100644
--- a/docs/Deploying/Server-Installation.md
+++ b/docs/Deploying/Server-Installation.md
@@ -264,7 +264,7 @@ spec:
     spec:
       containers:
       - name: fleet
-        image: fleetdm/fleet:4.20.1
+        image: fleetdm/fleet:4.21.0
         env:
           # if running Fleet behind external ingress controller that terminates TLS
           - name: FLEET_SERVER_TLS
diff --git a/infrastructure/dogfood/terraform/aws/variables.tf b/infrastructure/dogfood/terraform/aws/variables.tf
index 39805318bf..63f82fb641 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.20.1"
+  default     = "fleetdm/fleet:v4.21.0"
 }
 
 variable "software_inventory" {
diff --git a/infrastructure/dogfood/terraform/gcp/variables.tf b/infrastructure/dogfood/terraform/gcp/variables.tf
index e0b99a1dbd..3f1a9d6e82 100644
--- a/infrastructure/dogfood/terraform/gcp/variables.tf
+++ b/infrastructure/dogfood/terraform/gcp/variables.tf
@@ -68,5 +68,5 @@ variable "redis_mem" {
 }
 
 variable "image" {
-  default = "fleet:v4.20.1"
+  default = "fleet:v4.21.0"
 }
diff --git a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
index 95234a16f4..cc2f456e14 100644
--- a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
+++ b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
@@ -157,7 +157,7 @@ resource "helm_release" "main" {
 
   set {
     name  = "imageTag"
-    value = "v4.20.1"
+    value = "v4.21.0"
   }
 
   set {
diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json
index 4bca0eee37..d26d546d2f 100644
--- a/tools/fleetctl-npm/package.json
+++ b/tools/fleetctl-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleetctl",
-  "version": "v4.20.1",
+  "version": "v4.21.0",
   "description": "Installer for the fleetctl CLI tool",
   "bin": {
     "fleetctl": "./run.js"