diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7597f93f9c3..0f06d8734423 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,63 @@
+## Fleet 4.40.0 (Nov 3, 2023)
+
+### Changes
+
+* **Endpoint operations**:
+  - New tables added to the fleetd extension: app_icons, falconctl_options, falcon_kernel_check, cryptoinfo, cryptsetup_status, filevault_status, firefox_preferences, firmwarepasswd, ioreg, and windows_updates.
+
+* **Device management (MDM)**:
+  - Introduced support for MS-MDM management protocol.
+  - Added a host detail query for Windows hosts to ingest MDM device id and updated the Windows MDM device enrollment flow.
+  - Implemented `--context` and `--debug` flags for `fleetctl mdm run-command`.
+  - Support added for `fleetctl mdm run-command` on Windows hosts.
+  - macOS hosts with MDM features via SSO can now run `sudo profiles renew --type enrollment`.
+  - Introduced `GET mdm/commandresults` endpoint to retrieve MDM command results for Windows and macOS.
+  - `fleetctl get mdm-command-results` now uses the new above endpoint.
+  - Added `POST /fleet/mdm/commands/run` platform-agnostic endpoint for MDM commands.
+  - Introduced API for recent Windows MDM commands via `fleetctl` and the API.
+
+* **Vulnerability management**:
+  - Added vulnerability data support for JetBrains apps with similar names (e.g., IntelliJ IDEA.app vs. IntelliJ IDEA Ultimate.app).
+  - Apple Rapid Security Response version added to macOS host details (requires osquery v5.9.1 on macOS devices).
+  - For ChromeOS hosts, software now includes chrome extensions.
+  - Updated vulnerability processing to omit software without versions.
+  - Resolved false positives in vulnerabilities for Chrome and Firefox extensions.
+
+* **UI improvements**:
+  - Fleet tables in UI reset rows upon filter/search/page changes.
+  - Improved handling when deleting a large number of hosts; operations now continue in the background after 30 seconds.
+  - Added the ability for Observers and Observer+ to view policy resolutions.
+  - Improved app settings clarity for premium users regarding usage statistics.
+  - UI buttons for live queries or policies are now disabled with a tooltip if live queries are globally turned off.
+  - Observers and observer+ can now run existing policies in the UI.
+
+### Bug fixes and improvements
+
+* **REST API**:
+  - Overhauled REST API input validation for several endpoints (hosts, carves, users).
+  - Validation error status codes switched from 500 to 400 for clarity.
+  - Numerous new validations added for policy details, os_name/version, etc.
+  - Addressed issues in /fleet/sso and /mdm/apple/enqueue endpoints.
+  - Updated response codes for several other endpoints for clearer error handling.
+
+* **Logging and debugging**:
+  - Updated Apple Business Manager terms logging behavior.
+  - Refined the copy of the ABM terms banner for better clarity.
+  - Addressed a false positive CVE detection on the `certifi` python package.
+  - Fixed a logging issue with Fleet's Cloudflare WARP software version ingestion for Windows.
+
+* **UI fixes**:
+  - Addressed UI bugs for the "Turn off MDM" action display and issues with the host details page's banners.
+  - Fixed narrow viewport EULA display issue on the Windows TOS page.
+  - Rectified team dropdown value issues and ensured consistent help text across query and policy creation forms.
+  - Fixed issues when applying config changes without MDM features enabled.
+
+* **Others**:
+  - Removed the capability for Premium customers to disable usage statistics. Further information provided in the Fleet documentation.
+  - Retired creating OS policies from host OSes in the UI.
+  - Addressed issues in Live Queries with the POST /fleet/queries/run endpoint.
+  - Introduced database migrations for Windows MDM command tables.
+
 ## Fleet 4.39.0 (Oct 19, 2023)
 
 ### Changes
diff --git a/changes/10888-backend-analytics-for-premium b/changes/10888-backend-analytics-for-premium
deleted file mode 100644
index 3681afb0fdda..000000000000
--- a/changes/10888-backend-analytics-for-premium
+++ /dev/null
@@ -1 +0,0 @@
-* Removed the ability for Premium customers to disable usage statistics. The type of data collected has not changed; please see https://fleetdm.com/docs/using-fleet/usage-statistics for information on the exact contents of the usage statistics data.
\ No newline at end of file
diff --git a/changes/10888-premium-usage-statistics b/changes/10888-premium-usage-statistics
deleted file mode 100644
index 2b70cb6b45e1..000000000000
--- a/changes/10888-premium-usage-statistics
+++ /dev/null
@@ -1 +0,0 @@
-- App Settings informs premium users they are sending usage statistics and cannot disable feature
diff --git a/changes/12274-return-code-for-password-reset b/changes/12274-return-code-for-password-reset
deleted file mode 100644
index 0b4b0667c728..000000000000
--- a/changes/12274-return-code-for-password-reset
+++ /dev/null
@@ -1,11 +0,0 @@
-Fixed 500 return code from several endpoints.
-
-/api/v1/fleet/perform_required_password_reset
-- Now returns 403 when Authorization token is missing
-
-/api/v1/fleet/hosts_summary
-- Now returns 400 when low_disk_space parameter is invalid
-
-/api/v1/fleet/sessions/*
-- Now returns 404 when session cannot be found
-
diff --git a/changes/12559-sso-metadata-url b/changes/12559-sso-metadata-url
deleted file mode 100644
index a2debaf1d5e4..000000000000
--- a/changes/12559-sso-metadata-url
+++ /dev/null
@@ -1 +0,0 @@
-/fleet/sso endpoint now returns 400 status code (as opposed to 500) when SSO Metadata URL returns invalid data or when SSO Metadata provided by user is invalid.
\ No newline at end of file
diff --git a/changes/12888-apple-rapid-security-response b/changes/12888-apple-rapid-security-response
deleted file mode 100644
index 4b5d799782cd..000000000000
--- a/changes/12888-apple-rapid-security-response
+++ /dev/null
@@ -1,2 +0,0 @@
-Added Apple Rapid Security Response version to macOS host details.
-- This feature (new `extra` column on `os_version` for macOS devices) was added to osquery in v5.9.1. So macOS devices will need >= v5.9.1 version installed to use this feature.
diff --git a/changes/12997-mdm-config-validations b/changes/12997-mdm-config-validations
deleted file mode 100644
index 1d1534cd8b34..000000000000
--- a/changes/12997-mdm-config-validations
+++ /dev/null
@@ -1 +0,0 @@
-- Fixed issue where applying config changes would cause validation errors when MDM features were not enabled.
\ No newline at end of file
diff --git a/changes/13615-ignore-software-without-version b/changes/13615-ignore-software-without-version
deleted file mode 100644
index 00bb70315389..000000000000
--- a/changes/13615-ignore-software-without-version
+++ /dev/null
@@ -1 +0,0 @@
-* Updated vulnerability processing to ignore software that has been ingested without a version.
diff --git a/changes/13712-context-run-command b/changes/13712-context-run-command
deleted file mode 100644
index 2f7b91c60f99..000000000000
--- a/changes/13712-context-run-command
+++ /dev/null
@@ -1 +0,0 @@
-* Added support for `--context` and `--debug` flags to `fleetctl mdm run-command` 
diff --git a/changes/13889-IDEA-apps-with-similar-names b/changes/13889-IDEA-apps-with-similar-names
deleted file mode 100644
index 906be19212c2..000000000000
--- a/changes/13889-IDEA-apps-with-similar-names
+++ /dev/null
@@ -1,2 +0,0 @@
-Adding vulnerability data support for JetBrains applications (like IDEA, PyCharm, etc.) that have similar names.
-- For example: IntelliJ IDEA.app and IntelliJ IDEA Ultimate.app
\ No newline at end of file
diff --git a/changes/13907-get-mdm-commands b/changes/13907-get-mdm-commands
deleted file mode 100644
index 9475548706e3..000000000000
--- a/changes/13907-get-mdm-commands
+++ /dev/null
@@ -1 +0,0 @@
-* Added the ability to list recent Windows MDM commands via `fleetctl` and the API.
diff --git a/changes/13908-get-mdm-command-results b/changes/13908-get-mdm-command-results
deleted file mode 100644
index f3874cb8c22f..000000000000
--- a/changes/13908-get-mdm-command-results
+++ /dev/null
@@ -1,3 +0,0 @@
-- Added `GET mdm/commandresults` endpoint to retrieve the results of MDM commands
-  run on Windows or macOS devices.
-- Updated `fleetctl get mdm-command-results` to use the new endpoint.
diff --git a/changes/13998-host-options-validation b/changes/13998-host-options-validation
deleted file mode 100644
index bf6ec29532d3..000000000000
--- a/changes/13998-host-options-validation
+++ /dev/null
@@ -1,19 +0,0 @@
-Cleaned up REST API input validation for hosts, carves, users endpoints.
-
-For the following endpoints:
-/api/v1/fleet/hosts
-/api/v1/fleet/hosts/count
-/api/v1/fleet/hosts/report
-  - converted validation errors from 500 to 400 HTTP status code
-  - added validation that policy_id must be present when policy_response is specified
-  - added validation that policy_response must be `passing` or `failing`
-  - added validation that `os_name` must be specified with `os_version`
-
-For the following endpoint:
-/api/v1/fleet/users
-  - converted team_id validation error from 500 to 400 HTTP status code
-
-For the following endpoint:
-/api/v1/fleet/carves
-  - added rest-api.md documentation for `page`, `per_page`, `order_key`, `order_direction`, and `expired`
-  - converted `expired` validation error from 500 to 400 HTTP status code
diff --git a/changes/14056-file-ext b/changes/14056-file-ext
deleted file mode 100644
index ff78c65bcc87..000000000000
--- a/changes/14056-file-ext
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed a bug preventing Windows and Linux users to upload .mobileconfig files in the UI.
diff --git a/changes/14097-deleting-large-number-of-hosts b/changes/14097-deleting-large-number-of-hosts
deleted file mode 100644
index d1a74b45a63b..000000000000
--- a/changes/14097-deleting-large-number-of-hosts
+++ /dev/null
@@ -1,4 +0,0 @@
-Web UI no longer gives an error when deleting a large number of hosts.
-
-After 30 seconds, the 'Delete host' modal closes and the delete operation continues in the background.
-The following text has been added to the modal when deleting 500 or more hosts: "When deleting a large volume of hosts, it may take some time for this change to be reflected in the UI."
\ No newline at end of file
diff --git a/changes/14170-chromeos-software-bug b/changes/14170-chromeos-software-bug
deleted file mode 100644
index ec31205c7996..000000000000
--- a/changes/14170-chromeos-software-bug
+++ /dev/null
@@ -1 +0,0 @@
-- For ChromeOS hosts, surface chrome extensions as software
diff --git a/changes/14238-enroll-reference b/changes/14238-enroll-reference
deleted file mode 100644
index a8853d3c2f6d..000000000000
--- a/changes/14238-enroll-reference
+++ /dev/null
@@ -1 +0,0 @@
-* Allow macOS hosts that turned on MDM features via SSO to run `sudo profiles renew --type enrollment` to renew their MDM enrollment.
diff --git a/changes/14267-disable-run-button b/changes/14267-disable-run-button
deleted file mode 100644
index 9750977ae68e..000000000000
--- a/changes/14267-disable-run-button
+++ /dev/null
@@ -1 +0,0 @@
-- If live queries are disabled globally, all UI buttons to run a live query or policy are disabled with a tooltip explanation
diff --git a/changes/14267-forbidden-status-code b/changes/14267-forbidden-status-code
deleted file mode 100644
index 766335a21a4a..000000000000
--- a/changes/14267-forbidden-status-code
+++ /dev/null
@@ -1,2 +0,0 @@
-
-* Updates the POST /fleet/queries/run endpoint to return a 403 Forbidden response when Live Queries have been disabled by an administrator.
\ No newline at end of file
diff --git a/changes/14464-add-kolide-tables b/changes/14464-add-kolide-tables
deleted file mode 100644
index 24d1f29d54c3..000000000000
--- a/changes/14464-add-kolide-tables
+++ /dev/null
@@ -1,11 +0,0 @@
-- added tables to the fleetd extension: 
-  - app_icons
-  - falconctl_options
-  - falcon_kernel_check
-  - cryptoinfo
-  - cryptsetup_status
-  - filevault_status
-  - firefox_preferences
-  - firmwarepasswd
-  - ioreg
-  - windows_updates
diff --git a/changes/14509-consistent-help-save-text b/changes/14509-consistent-help-save-text
deleted file mode 100644
index 05bf9c8933c0..000000000000
--- a/changes/14509-consistent-help-save-text
+++ /dev/null
@@ -1 +0,0 @@
-- Creating a query and creating a policy has consistent help text for form fields
diff --git a/changes/14522-fix-cloudflare-warp-versioning b/changes/14522-fix-cloudflare-warp-versioning
deleted file mode 100644
index 742c2f733806..000000000000
--- a/changes/14522-fix-cloudflare-warp-versioning
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed how Fleet ingest Windows' Cloudflare WARP software version.
diff --git a/changes/14529-enqueue-apple-error b/changes/14529-enqueue-apple-error
deleted file mode 100644
index 4bd1f7541d71..000000000000
--- a/changes/14529-enqueue-apple-error
+++ /dev/null
@@ -1,3 +0,0 @@
-* Change the response status code of /mdm/apple/enqueue to `400` if the host is:
-  - A macOS host that hasn't turned on Fleet MDM features.
-  - A Windows or Linux host.
diff --git a/changes/14543-fix-false-positive-python-certifi b/changes/14543-fix-false-positive-python-certifi
deleted file mode 100644
index fa069f1bd9ad..000000000000
--- a/changes/14543-fix-false-positive-python-certifi
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed false positive CVE-2023-37920 detected on `certifi` python package.
diff --git a/changes/14554-software-endpoint-validation b/changes/14554-software-endpoint-validation
deleted file mode 100644
index f189e5e48204..000000000000
--- a/changes/14554-software-endpoint-validation
+++ /dev/null
@@ -1,4 +0,0 @@
-For the following endpoints:
-/api/v1/fleet/software
-/api/v1/fleet/software/count
-  - added validation on `page`, `per_page`, `order_key`, `order_direction` -- invalid values will now return 400 HTTP status code
diff --git a/changes/14577-observer-plus-run-policies b/changes/14577-observer-plus-run-policies
deleted file mode 100644
index 6c7b0af28b69..000000000000
--- a/changes/14577-observer-plus-run-policies
+++ /dev/null
@@ -1 +0,0 @@
-- Bug fix: Allow Observer+ ability to run all existing policies in the UI
diff --git a/changes/14596-reset-selected-rows b/changes/14596-reset-selected-rows
deleted file mode 100644
index 40b788641202..000000000000
--- a/changes/14596-reset-selected-rows
+++ /dev/null
@@ -1 +0,0 @@
-- All Fleet tables in the UI will reset rows selected if user changes filters, search query, or paginates
diff --git a/changes/14620-save-inherited-query b/changes/14620-save-inherited-query
deleted file mode 100644
index 87a66aa98a54..000000000000
--- a/changes/14620-save-inherited-query
+++ /dev/null
@@ -1 +0,0 @@
-- Fix bug where save as new for an inherited query will correctly save on the currently selected team
diff --git a/changes/14643-retire-creating-os-policy b/changes/14643-retire-creating-os-policy
deleted file mode 100644
index cdfa24d6f7ca..000000000000
--- a/changes/14643-retire-creating-os-policy
+++ /dev/null
@@ -1 +0,0 @@
-- Retired creating OS policy in the UI from a host's operating system
diff --git a/changes/14733-14661-queries-page-fix b/changes/14733-14661-queries-page-fix
deleted file mode 100644
index afcbb9db80c6..000000000000
--- a/changes/14733-14661-queries-page-fix
+++ /dev/null
@@ -1 +0,0 @@
-- Add inherited table information to URL params and use URL params for source of truth to fix any bugs between multi-table view
diff --git a/changes/14742-mdm-windows-enrollments-host-uuid b/changes/14742-mdm-windows-enrollments-host-uuid
deleted file mode 100644
index cfa45998b612..000000000000
--- a/changes/14742-mdm-windows-enrollments-host-uuid
+++ /dev/null
@@ -1,2 +0,0 @@
-- Added host detail query for Windows hosts to ingest MDM device id
-- Updated Windows MDM device enrollment flow to associate MDM device id with host uuid
diff --git a/changes/14842-turn-off-mdm-action b/changes/14842-turn-off-mdm-action
deleted file mode 100644
index 6c16668a5855..000000000000
--- a/changes/14842-turn-off-mdm-action
+++ /dev/null
@@ -1,2 +0,0 @@
-- Fixed UI bug where the "Turn off MDM" action on the host details page was displayed for hosts on
-  platforms where that action is not yet supported by Fleet.
diff --git a/changes/bug-14431-surface-resolution-to-observers b/changes/bug-14431-surface-resolution-to-observers
deleted file mode 100644
index 1d14d325f0f5..000000000000
--- a/changes/bug-14431-surface-resolution-to-observers
+++ /dev/null
@@ -1 +0,0 @@
-- Observers and observer+ can view policy resolutions in UI
\ No newline at end of file
diff --git a/changes/fix-chrome-and-firefox-extensions-false-positives b/changes/fix-chrome-and-firefox-extensions-false-positives
deleted file mode 100644
index 23351e308b04..000000000000
--- a/changes/fix-chrome-and-firefox-extensions-false-positives
+++ /dev/null
@@ -1 +0,0 @@
-* Fix false positive vulnerabilities found in Chrome and Firefox extensions.
diff --git a/changes/issue-12841-msmdm-management-protocol b/changes/issue-12841-msmdm-management-protocol
deleted file mode 100644
index 24c493c81ba3..000000000000
--- a/changes/issue-12841-msmdm-management-protocol
+++ /dev/null
@@ -1 +0,0 @@
-* Adding support for MS-MDM management protocol
diff --git a/changes/issue-13010-fix-host-details-page-banners b/changes/issue-13010-fix-host-details-page-banners
deleted file mode 100644
index dfd2561a580f..000000000000
--- a/changes/issue-13010-fix-host-details-page-banners
+++ /dev/null
@@ -1,2 +0,0 @@
-- Fix banners on the host details page. If the ABM expired banner is displayed we suppress all
-  other banners on that page.
diff --git a/changes/issue-13012-log-abm-terms-change b/changes/issue-13012-log-abm-terms-change
deleted file mode 100644
index 09ad0caf78c3..000000000000
--- a/changes/issue-13012-log-abm-terms-change
+++ /dev/null
@@ -1 +0,0 @@
-* Modified logging of when the Apple Business Manager terms have changed so that it does not require debug logging.
diff --git a/changes/issue-13012-update-abm-terms-banner-copy b/changes/issue-13012-update-abm-terms-banner-copy
deleted file mode 100644
index 6b5d823ab235..000000000000
--- a/changes/issue-13012-update-abm-terms-banner-copy
+++ /dev/null
@@ -1,2 +0,0 @@
-- update the copy of the ABM terms banner to reflect that Apple may take a while to report the
-  correct status back to Fleet.
diff --git a/changes/issue-13594-run-mdm-command-on-windows b/changes/issue-13594-run-mdm-command-on-windows
deleted file mode 100644
index 5536f9380327..000000000000
--- a/changes/issue-13594-run-mdm-command-on-windows
+++ /dev/null
@@ -1 +0,0 @@
-* Updated the `fleetctl mdm run-command` sub-command to use the new platform-agnostic endpoint and support for running MDM commands on Windows hosts.
diff --git a/changes/issue-13595-add-run-mdm-command-endpoint b/changes/issue-13595-add-run-mdm-command-endpoint
deleted file mode 100644
index c1e6b9c25b85..000000000000
--- a/changes/issue-13595-add-run-mdm-command-endpoint
+++ /dev/null
@@ -1 +0,0 @@
-* Added the `POST /fleet/mdm/commands/run` platform-agnostic endpoint to run an MDM command.
diff --git a/changes/issue-13880-fix-windows-eula b/changes/issue-13880-fix-windows-eula
deleted file mode 100644
index 884d3d6e058c..000000000000
--- a/changes/issue-13880-fix-windows-eula
+++ /dev/null
@@ -1 +0,0 @@
-- Fixes EULA on the windows TOS page. The EULA now shows correctly on narrow viewports
diff --git a/changes/issue-13904-create-windows-mdm-command-tables b/changes/issue-13904-create-windows-mdm-command-tables
deleted file mode 100644
index 1a50ba4644a0..000000000000
--- a/changes/issue-13904-create-windows-mdm-command-tables
+++ /dev/null
@@ -1 +0,0 @@
-* Added database migrations to create tables for the Windows MDM commands.
diff --git a/changes/issue-14418-fix-team-dropdown b/changes/issue-14418-fix-team-dropdown
deleted file mode 100644
index 2ab53dff3ebc..000000000000
--- a/changes/issue-14418-fix-team-dropdown
+++ /dev/null
@@ -1 +0,0 @@
-- fix issue where team dropdown value was changing when selecting a host that was on a team.
diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml
index 5d842aa955b8..7166517e0fec 100644
--- a/charts/fleet/Chart.yaml
+++ b/charts/fleet/Chart.yaml
@@ -8,4 +8,4 @@ version: v5.0.1
 home: https://github.com/fleetdm/fleet
 sources:
   - https://github.com/fleetdm/fleet.git
-appVersion: v4.39.0
+appVersion: v4.40.0
diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml
index bab6cc528b8d..f557b75f93bd 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.39.0 # Version of Fleet to deploy
+imageTag: v4.40.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 bf33e988d82d..5378db764695 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.39.0"
+  default     = "fleetdm/fleet:v4.40.0"
 }
 
 variable "software_inventory" {
diff --git a/infrastructure/dogfood/terraform/gcp/variables.tf b/infrastructure/dogfood/terraform/gcp/variables.tf
index 4132addfdd51..a81a7fabffe8 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.39.0"
+  default = "fleet:v4.40.0"
 }
diff --git a/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf b/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf
index 95cf0a1e40cd..aecaa4681288 100644
--- a/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf
+++ b/infrastructure/sandbox/JITProvisioner/jitprovisioner.tf
@@ -206,7 +206,7 @@ resource "random_uuid" "jitprovisioner" {
 
 # Use the local to make the trigger work.
 locals {
-  fleet_tag = "v4.39.0"
+  fleet_tag = "v4.40.0"
 }
 
 resource "null_resource" "standard-query-library" {
diff --git a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
index d6421ad5256f..661a9ecc8aef 100644
--- a/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
+++ b/infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
@@ -165,7 +165,7 @@ resource "helm_release" "main" {
 
   set {
     name  = "imageTag"
-    value = "v4.39.0"
+    value = "v4.40.0"
   }
 
   set {
diff --git a/terraform/byo-vpc/byo-db/byo-ecs/variables.tf b/terraform/byo-vpc/byo-db/byo-ecs/variables.tf
index 424ad652a926..7e2b4a83c2a9 100644
--- a/terraform/byo-vpc/byo-db/byo-ecs/variables.tf
+++ b/terraform/byo-vpc/byo-db/byo-ecs/variables.tf
@@ -13,7 +13,7 @@ variable "fleet_config" {
   type = object({
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
-    image                        = optional(string, "fleetdm/fleet:v4.39.0")
+    image                        = optional(string, "fleetdm/fleet:v4.40.0")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
diff --git a/terraform/byo-vpc/byo-db/variables.tf b/terraform/byo-vpc/byo-db/variables.tf
index ea2d4dc7619c..ad95e3cf678b 100644
--- a/terraform/byo-vpc/byo-db/variables.tf
+++ b/terraform/byo-vpc/byo-db/variables.tf
@@ -74,7 +74,7 @@ variable "fleet_config" {
   type = object({
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
-    image                        = optional(string, "fleetdm/fleet:v4.39.0")
+    image                        = optional(string, "fleetdm/fleet:v4.40.0")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
diff --git a/terraform/byo-vpc/example/main.tf b/terraform/byo-vpc/example/main.tf
index 9e6a314defad..da3d223b2b97 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.39.0"
+  fleet_image = "fleetdm/fleet:v4.40.0"
 }
 
 resource "random_pet" "main" {}
diff --git a/terraform/byo-vpc/variables.tf b/terraform/byo-vpc/variables.tf
index 654388726401..b92cd8f4a7f0 100644
--- a/terraform/byo-vpc/variables.tf
+++ b/terraform/byo-vpc/variables.tf
@@ -165,7 +165,7 @@ variable "fleet_config" {
   type = object({
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
-    image                        = optional(string, "fleetdm/fleet:v4.39.0")
+    image                        = optional(string, "fleetdm/fleet:v4.40.0")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
diff --git a/terraform/variables.tf b/terraform/variables.tf
index 3595bffaebc2..fe8aec79a86a 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -215,7 +215,7 @@ variable "fleet_config" {
   type = object({
     mem                          = optional(number, 4096)
     cpu                          = optional(number, 512)
-    image                        = optional(string, "fleetdm/fleet:v4.39.0")
+    image                        = optional(string, "fleetdm/fleet:v4.40.0")
     family                       = optional(string, "fleet")
     sidecars                     = optional(list(any), [])
     depends_on                   = optional(list(any), [])
diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json
index 2afc934f093a..a1435195487e 100644
--- a/tools/fleetctl-npm/package.json
+++ b/tools/fleetctl-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleetctl",
-  "version": "v4.39.0",
+  "version": "v4.40.0",
   "description": "Installer for the fleetctl CLI tool",
   "bin": {
     "fleetctl": "./run.js"