diff --git a/CHANGELOG.md b/CHANGELOG.md
index d52d86832a6f..88f6b82a6efb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,60 @@
+## Fleet 4.58.0 (Oct 17, 2024)
+
+**Endpoint Operations:**
+
+* Added builtin label for Fedora Linux.  **Warning:** Migrations will fail if a pre-existing 'Fedora Linux' label exists. To resolve, delete the existing 'Fedora Linux' label.
+* Added ability to trigger script run on policy failure.
+* Updated GitOps script and software installer relative paths to now always relative to the file they're in. This change breaks existing YAML files that had to account for previous inconsistent behavior (e.g. script paths declared in no-team.yml being relative to default.yaml one directory up).
+* Improved performance for host details and Fleet Desktop, particularly in environments using high volumes of live queries.
+* Updated activity cleanup job to remove all expired live queries to improve API performance in environment using large volumes of live queries.  To note, the cleanup cron may take longer on the first run after upgrade.
+* Added an event for when a policy automation triggers a script run in the activity feed.
+* Added battery status to Windows host details.
+
+**Device Management (MDM):**
+
+* Added the `POST /software/fleet_maintained_apps` endpoint for adding Fleet-maintained apps.
+* Added the `GET /software/fleet_maintained_apps/{app_id}` endpoint to retrieve details of a Fleet-maintained app.
+* Added API endpoint to list team available Fleet-maintained apps.
+* Added UI for managing Fleet-maintained apps.
+* Updated add software modal to be seperate pages in Fleet UI.
+* Added support for uploading RPM packages.
+* Updated the request timeouts for software installer edits to be the same as initial software installer uploads.
+* Updated UI for software uploads to include upload progress bar.
+* Improved performance of SQL queries used to determine MDM profile status for Apple hosts.
+
+**Vulnerability Management:**
+
+* Fixed MSRC feed pulls (for NVD release builds) in environments where GitHub access is authenticated.
+
+**Bug fixes and improvements:**
+
+* Added the 'Unsupported screen size' UI on the My device page.
+* Removed redundant built in label filter pills.
+* Updated success messages for lock, unlock, and wipe commands in the UI.
+* Restricted width of policy description wrappers for better UI.
+* Updated host details about section to condense information into fewer columns at smaller widths.
+* Hid CVSS severity column from Fleet Free software details > vulnerabilities sections.
+* Updated UI to remove leading/trailing whitespace when creating or editing team or query names.
+* Added UI improvements when selecting live query targets (e.g. styling, closing behavior).
+* Updated API to return 409 instead of 500 when trying to delete an installer associated with a policy automation.
+* Updated battery health definitions to be defined as cycle counts greater than 1000 or max capacity falling under 80% of designed capacity for macOS and Windows.
+* Added information on how battery health is defined to the UI.
+* Updated UI to surface duplicate label name error to user.
+* Fixed software uninstaller script for `pkg`s to only remove '.app' directories installed by the package.
+* Fixed "no rows" error when adding a software installer that matches an existing title's name and source but not its bundle ID.
+* Fixed an issue with the migration adding support for multiple VPP tokens that would happen if a token is removed prior to upgrading Fleet.
+* Fixed UI flow for observers to easily query hosts from the host details page.
+* Fixed bug with label display names always sentence casing.
+* Fixed a bug where a profile wouldn't be removed from a host if it was deleted or if the host was moved to another team before the profile was installed on the host.
+* Fixed a bug where removing a VPP or ABM token from a GitOps YAML file would leave the team assignments unchanged.
+* Fixed host software filter bug that resets dropdown filter on table changes (pagination, order by column, etc).
+* Fixed UI bug: Edit team name closes modal.
+* Fixed UI so that switching vulnerability search types does not cause page re-render.
+* Fixed UI policy automation truncation when selecting software to auto-install.
+* Fixed UI design bug where software package file name was not displayed as expected.
+* Fixed a small UI bug where a button overlapped some copy.
+* Fixed software icon for chrome packages.
+
 ## Fleet 4.57.3 (Oct 11, 2024)
 
 ### Bug fixes
diff --git a/changes/18354-update-success-messages b/changes/18354-update-success-messages
deleted file mode 100644
index 98f582dad033..000000000000
--- a/changes/18354-update-success-messages
+++ /dev/null
@@ -1 +0,0 @@
-* Update success messages for lock, unlock, and wipe commands in the UI.
diff --git a/changes/19619-align-battery-health b/changes/19619-align-battery-health
deleted file mode 100644
index 6bbe536bcf60..000000000000
--- a/changes/19619-align-battery-health
+++ /dev/null
@@ -1 +0,0 @@
-- battery health definitions now defined as cycle counts greater than 1000 or max capacity falling under 80% of designed capacity for macOS and Windows
\ No newline at end of file
diff --git a/changes/19619-win-battery b/changes/19619-win-battery
deleted file mode 100644
index 4ea9aca94fb5..000000000000
--- a/changes/19619-win-battery
+++ /dev/null
@@ -1,2 +0,0 @@
-- Windows host details now include battery status
-- UI includes information on how battery health is defined
diff --git a/changes/20308-file-uploader b/changes/20308-file-uploader
deleted file mode 100644
index 675c212d4b51..000000000000
--- a/changes/20308-file-uploader
+++ /dev/null
@@ -1 +0,0 @@
-- Update UI for software uploads to include upload progress bar.
diff --git a/changes/20537-add-rpm-support b/changes/20537-add-rpm-support
deleted file mode 100644
index 2238298b2413..000000000000
--- a/changes/20537-add-rpm-support
+++ /dev/null
@@ -1 +0,0 @@
-* Added support for uploading RPM packages.
diff --git a/changes/20683-less-columns-smaller-width b/changes/20683-less-columns-smaller-width
deleted file mode 100644
index c2e03aedde0c..000000000000
--- a/changes/20683-less-columns-smaller-width
+++ /dev/null
@@ -1 +0,0 @@
-- UI cleanup: Host details about section condenses information into fewer columns at smaller widths
diff --git a/changes/20865-fix-chrome-icon b/changes/20865-fix-chrome-icon
deleted file mode 100644
index 9ac53c39ccd8..000000000000
--- a/changes/20865-fix-chrome-icon
+++ /dev/null
@@ -1 +0,0 @@
-- show proper software icon for chrome packages
diff --git a/changes/20959-query-host-flow-fix-observer b/changes/20959-query-host-flow-fix-observer
deleted file mode 100644
index f1db67c3e9af..000000000000
--- a/changes/20959-query-host-flow-fix-observer
+++ /dev/null
@@ -1 +0,0 @@
-- Fix UI flow for observers to easily query hosts from the host details page
diff --git a/changes/21276-select-live-query-targets-improvements b/changes/21276-select-live-query-targets-improvements
deleted file mode 100644
index 75b2086beb03..000000000000
--- a/changes/21276-select-live-query-targets-improvements
+++ /dev/null
@@ -1 +0,0 @@
-- UI Improvements to selecting live query targets (e.g. styling, closing behavior)
diff --git a/changes/21343-hide-redundant-built-in-label-pills b/changes/21343-hide-redundant-built-in-label-pills
deleted file mode 100644
index 92baea5ba52f..000000000000
--- a/changes/21343-hide-redundant-built-in-label-pills
+++ /dev/null
@@ -1 +0,0 @@
-- UI: Remove redundant built in label filter pills
diff --git a/changes/21370-bundle-id-quickfix b/changes/21370-bundle-id-quickfix
deleted file mode 100644
index 1f27bedc40af..000000000000
--- a/changes/21370-bundle-id-quickfix
+++ /dev/null
@@ -1 +0,0 @@
-- Fix "no rows" error when adding a software installer that matches an existing title's name and source but not its bundle ID
diff --git a/changes/21409-fedora-label b/changes/21409-fedora-label
deleted file mode 100644
index 2f0ca7cfd61e..000000000000
--- a/changes/21409-fedora-label
+++ /dev/null
@@ -1 +0,0 @@
-- added builtin label for Fedora Linux.  Warning: migrations will fail if a pre-existing 'Fedora Linux' label exists.  To resolve, delete the existing 'Fedora Linux' label.
\ No newline at end of file
diff --git a/changes/21594-host-software-filter-bug b/changes/21594-host-software-filter-bug
deleted file mode 100644
index fb7ff11dda66..000000000000
--- a/changes/21594-host-software-filter-bug
+++ /dev/null
@@ -1 +0,0 @@
-- Fleet UI: Fix host software filter bug that resets dropdown filter on table changes (pagination, order by column, etc)
diff --git a/changes/21773-ingest-fleet-maintained-apps b/changes/21773-ingest-fleet-maintained-apps
deleted file mode 100644
index f5f01a3995e5..000000000000
--- a/changes/21773-ingest-fleet-maintained-apps
+++ /dev/null
@@ -1 +0,0 @@
-* Added the definition of the Fleet maintained apps and its ingestion.
diff --git a/changes/21775-ui-fleet-maintained-apps b/changes/21775-ui-fleet-maintained-apps
deleted file mode 100644
index 3cb4883f9b84..000000000000
--- a/changes/21775-ui-fleet-maintained-apps
+++ /dev/null
@@ -1 +0,0 @@
-- add UI for adding fleet maintained apps
diff --git a/changes/21776-add-software b/changes/21776-add-software
deleted file mode 100644
index 65c32b4d8805..000000000000
--- a/changes/21776-add-software
+++ /dev/null
@@ -1 +0,0 @@
-- Adds the `POST /software/fleet_maintained` endpoint for adding Fleet-maintained apps.
\ No newline at end of file
diff --git a/changes/21777-list-fleet-manated-apps b/changes/21777-list-fleet-manated-apps
deleted file mode 100644
index 7da57b618796..000000000000
--- a/changes/21777-list-fleet-manated-apps
+++ /dev/null
@@ -1 +0,0 @@
-- Add API endpoint to list team available Fleet-maintained apps
diff --git a/changes/218090-add-sofware-from-modal-to-pages b/changes/218090-add-sofware-from-modal-to-pages
deleted file mode 100644
index e5c6321a7b67..000000000000
--- a/changes/218090-add-sofware-from-modal-to-pages
+++ /dev/null
@@ -1 +0,0 @@
-- change add software modal to be seperate pages in Fleet UI
diff --git a/changes/21811-add-vpp-flow-to-new-add-software-pages b/changes/21811-add-vpp-flow-to-new-add-software-pages
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/changes/21875-duplicate-label-name b/changes/21875-duplicate-label-name
deleted file mode 100644
index 80ee9d9e6925..000000000000
--- a/changes/21875-duplicate-label-name
+++ /dev/null
@@ -1 +0,0 @@
-- Fleet UI: Surface duplicate label name error to user
diff --git a/changes/21891-mdm-profile-fails b/changes/21891-mdm-profile-fails
deleted file mode 100644
index a01bac1649cf..000000000000
--- a/changes/21891-mdm-profile-fails
+++ /dev/null
@@ -1,2 +0,0 @@
-- Fixes a bug where a profile wouldn't be removed from a host if it was deleted or if the host was
-  moved to another team before the profile was installed on the host.
\ No newline at end of file
diff --git a/changes/21923-switch-exact-search-focus-bug b/changes/21923-switch-exact-search-focus-bug
deleted file mode 100644
index 0ae8b45da921..000000000000
--- a/changes/21923-switch-exact-search-focus-bug
+++ /dev/null
@@ -1 +0,0 @@
-- UI fix: Switching vulnerability search types does not cause page re-render
diff --git a/changes/22094-cleanup-queries b/changes/22094-cleanup-queries
deleted file mode 100644
index af8e9ab77da8..000000000000
--- a/changes/22094-cleanup-queries
+++ /dev/null
@@ -1 +0,0 @@
-- updated activity cleanup job to remove all expired live queries to improve API performance in environment using large volumes of live queries.  To note, the cleanup cron may take longer on the first run after upgrade.
\ No newline at end of file
diff --git a/changes/22094-query-optimization b/changes/22094-query-optimization
deleted file mode 100644
index bd779b451346..000000000000
--- a/changes/22094-query-optimization
+++ /dev/null
@@ -1 +0,0 @@
-- Increased performance for Host details and Fleet Desktop, particularly in environments using high volumes of live queries
\ No newline at end of file
diff --git a/changes/22097-mdm-migration-guide b/changes/22097-mdm-migration-guide
deleted file mode 100644
index 0177cf49b6b5..000000000000
--- a/changes/22097-mdm-migration-guide
+++ /dev/null
@@ -1 +0,0 @@
-- Updates the guide for MDM migration to include the new UX in fleetd.
\ No newline at end of file
diff --git a/changes/22106-fix-software-package-name b/changes/22106-fix-software-package-name
deleted file mode 100644
index 3cd87a328e55..000000000000
--- a/changes/22106-fix-software-package-name
+++ /dev/null
@@ -1 +0,0 @@
-- Fixed UI design bug where software package file name was not displayed as expected.
diff --git a/changes/22118-run-scripts-fe b/changes/22118-run-scripts-fe
deleted file mode 100644
index e5dc2f51ddf8..000000000000
--- a/changes/22118-run-scripts-fe
+++ /dev/null
@@ -1 +0,0 @@
-* Add ability to trigger script run on policy failure
\ No newline at end of file
diff --git a/changes/22122-mdm-apple-status-queries b/changes/22122-mdm-apple-status-queries
deleted file mode 100644
index 2ea893d31ff5..000000000000
--- a/changes/22122-mdm-apple-status-queries
+++ /dev/null
@@ -1 +0,0 @@
-- Improved performance of SQL queries used to determine MDM profile status for Apple hosts.
\ No newline at end of file
diff --git a/changes/22159-hide-severity-fleet-free b/changes/22159-hide-severity-fleet-free
deleted file mode 100644
index ddb47088fa36..000000000000
--- a/changes/22159-hide-severity-fleet-free
+++ /dev/null
@@ -1 +0,0 @@
-- Hide CVSS severity column from Fleet Free software details > vulnerabilities sections
diff --git a/changes/22197-policy-auto-software-truncation b/changes/22197-policy-auto-software-truncation
deleted file mode 100644
index 4b4740622e6c..000000000000
--- a/changes/22197-policy-auto-software-truncation
+++ /dev/null
@@ -1 +0,0 @@
-- Fleet UI: Fix policy automation truncation when selecting software to auto-install
\ No newline at end of file
diff --git a/changes/22198-defaults b/changes/22198-defaults
deleted file mode 100644
index ec243e9a48e4..000000000000
--- a/changes/22198-defaults
+++ /dev/null
@@ -1,2 +0,0 @@
-- Fixes a bug where removing a VPP or ABM token from a GitOps YAML file would leave the team
-  assignments unchanged.
\ No newline at end of file
diff --git a/changes/22207-close-team-modal b/changes/22207-close-team-modal
deleted file mode 100644
index cad918366754..000000000000
--- a/changes/22207-close-team-modal
+++ /dev/null
@@ -1 +0,0 @@
-- Fix UI bug: Edit team name closes modal
diff --git a/changes/22212-trim-names b/changes/22212-trim-names
deleted file mode 100644
index 3f52cb9a06ea..000000000000
--- a/changes/22212-trim-names
+++ /dev/null
@@ -1 +0,0 @@
-* Update UI to remove leading/trailing whitespace when creating or editing team or query names.
\ No newline at end of file
diff --git a/changes/22234-fleet-maintained-apps-get-api b/changes/22234-fleet-maintained-apps-get-api
deleted file mode 100644
index 837dde425f1e..000000000000
--- a/changes/22234-fleet-maintained-apps-get-api
+++ /dev/null
@@ -1 +0,0 @@
-- Add endpoint to retrieve details on fleet maintained app
diff --git a/changes/22330-label-display-names b/changes/22330-label-display-names
deleted file mode 100644
index e79bf855ce16..000000000000
--- a/changes/22330-label-display-names
+++ /dev/null
@@ -1 +0,0 @@
-- Fix bug with label display names always sentence casing
diff --git a/changes/22415-fix-vpp-migration b/changes/22415-fix-vpp-migration
deleted file mode 100644
index eed21b93dc12..000000000000
--- a/changes/22415-fix-vpp-migration
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed an issue with the migration adding support for multiple VPP tokens that would happen if a token is removed prior to upgrading Fleet.
diff --git a/changes/22485-BYOD-enroll-copy-button b/changes/22485-BYOD-enroll-copy-button
deleted file mode 100644
index 02275c1a1b8b..000000000000
--- a/changes/22485-BYOD-enroll-copy-button
+++ /dev/null
@@ -1 +0,0 @@
-* Fix a small UI bug where a button overlapped some copy.
\ No newline at end of file
diff --git a/changes/22490-unsupported-screen-size-DUP b/changes/22490-unsupported-screen-size-DUP
deleted file mode 100644
index f92b217f024f..000000000000
--- a/changes/22490-unsupported-screen-size-DUP
+++ /dev/null
@@ -1 +0,0 @@
-* Show the 'Unsupported screen size' UI on the My device page
\ No newline at end of file
diff --git a/changes/22492-msrc-fix b/changes/22492-msrc-fix
deleted file mode 100644
index 4bd6035faaed..000000000000
--- a/changes/22492-msrc-fix
+++ /dev/null
@@ -1 +0,0 @@
-* Fix MSRC feed pulls (for NVD release builds) in environments where GitHub access is authenticated
diff --git a/changes/22555-gitops-paths b/changes/22555-gitops-paths
deleted file mode 100644
index f03618e3038c..000000000000
--- a/changes/22555-gitops-paths
+++ /dev/null
@@ -1 +0,0 @@
-* GitOps script and software installer relative paths are now always relative to the file they're in. This change breaks existing YAML files that had to account for previous inconsistent behavior (e.g. script paths declared in no-team.yml being relative to default.yaml one directory up).
\ No newline at end of file
diff --git a/changes/22565-policy-automation-sw-delete-400 b/changes/22565-policy-automation-sw-delete-400
deleted file mode 100644
index 4a0a42d04f1f..000000000000
--- a/changes/22565-policy-automation-sw-delete-400
+++ /dev/null
@@ -1 +0,0 @@
-* Return 409 instead of 500 when trying to delete an installer associated with a policy automation.
diff --git a/changes/22571-fix-pkg-uninstall b/changes/22571-fix-pkg-uninstall
deleted file mode 100644
index 4118221f5f0b..000000000000
--- a/changes/22571-fix-pkg-uninstall
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed software uninstaller script for `pkg`s to only remove '.app' directories installed by the package.
diff --git a/changes/22619-policy-scrollbar b/changes/22619-policy-scrollbar
deleted file mode 100644
index 9a92b6d9bb85..000000000000
--- a/changes/22619-policy-scrollbar
+++ /dev/null
@@ -1 +0,0 @@
-* Restrict width of policy description wrappers for better UI
\ No newline at end of file
diff --git a/changes/22692-script-policy-id b/changes/22692-script-policy-id
deleted file mode 100644
index dc7de0c56a37..000000000000
--- a/changes/22692-script-policy-id
+++ /dev/null
@@ -1 +0,0 @@
-* Record which policy automation triggered a script run in the activity feed
diff --git a/changes/software-edit-request-deadline b/changes/software-edit-request-deadline
deleted file mode 100644
index f3576256f5ed..000000000000
--- a/changes/software-edit-request-deadline
+++ /dev/null
@@ -1 +0,0 @@
-* Ensure request timeouts for software installer edits are just as high as for initial software installer uploads
diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml
index 35e3c9c5d5c8..bacdc21fb5e4 100644
--- a/charts/fleet/Chart.yaml
+++ b/charts/fleet/Chart.yaml
@@ -8,7 +8,7 @@ version: v6.2.0
 home: https://github.com/fleetdm/fleet
 sources:
   - https://github.com/fleetdm/fleet.git
-appVersion: v4.57.3
+appVersion: v4.58.0
 dependencies:
   - name: mysql
     condition: mysql.enabled
diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml
index dfa0df541aa7..025f133c8402 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.57.3 # Version of Fleet to deploy
+imageTag: v4.58.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 f2d16185c9cd..ecf76f59dd12 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.57.3"
+  default     = "fleetdm/fleet:v4.58.0"
 }
 
 variable "software_inventory" {
diff --git a/infrastructure/dogfood/terraform/gcp/variables.tf b/infrastructure/dogfood/terraform/gcp/variables.tf
index 068a01b0a2a7..2ce08050834d 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.57.3"
+  default = "fleetdm/fleet:v4.58.0"
 }
 
 variable "software_installers_bucket_name" {
diff --git a/terraform/addons/vuln-processing/variables.tf b/terraform/addons/vuln-processing/variables.tf
index daaa9e96dad6..1d0533f68b38 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.57.3")
+    image                                = optional(string, "fleetdm/fleet:v4.58.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.57.3"
+    image                                = "fleetdm/fleet:v4.58.0"
     family                               = "fleet-vuln-processing"
     sidecars                             = []
     extra_environment_variables          = {}
diff --git a/terraform/byo-vpc/byo-db/byo-ecs/variables.tf b/terraform/byo-vpc/byo-db/byo-ecs/variables.tf
index 2c9d0edaf46d..dd1b41a515cf 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.57.3")
+    image                        = optional(string, "fleetdm/fleet:v4.58.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.57.3"
+    image                        = "fleetdm/fleet:v4.58.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 0fb01d16dfd9..1061c755f459 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.57.3")
+    image                        = optional(string, "fleetdm/fleet:v4.58.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.57.3"
+    image                        = "fleetdm/fleet:v4.58.0"
     family                       = "fleet"
     sidecars                     = []
     depends_on                   = []
diff --git a/terraform/byo-vpc/example/main.tf b/terraform/byo-vpc/example/main.tf
index 2ba565635328..0a9d210df164 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.57.3"
+  fleet_image = "fleetdm/fleet:v4.58.0"
   domain_name = "example.com"
 }
 
diff --git a/terraform/byo-vpc/variables.tf b/terraform/byo-vpc/variables.tf
index 875145352ba1..9c725a12b2ad 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.57.3")
+    image                        = optional(string, "fleetdm/fleet:v4.58.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.57.3"
+    image                        = "fleetdm/fleet:v4.58.0"
     family                       = "fleet"
     sidecars                     = []
     depends_on                   = []
diff --git a/terraform/example/main.tf b/terraform/example/main.tf
index bd9d001fd0c0..1bb4f8f57327 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.57.3"
-    image = "fleetdm/fleet:v4.57.3" # override default to deploy the image you desire
+    # for the Fleet image. e.g. "quay.io/fleetdm/fleet:v4.58.0"
+    image = "fleetdm/fleet:v4.58.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 9b81f39ef187..637d7095a266 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.57.3")
+    image                        = optional(string, "fleetdm/fleet:v4.58.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.57.3"
+    image                        = "fleetdm/fleet:v4.58.0"
     family                       = "fleet"
     sidecars                     = []
     depends_on                   = []
diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json
index 42b59441c5d5..d7c3201df007 100644
--- a/tools/fleetctl-npm/package.json
+++ b/tools/fleetctl-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleetctl",
-  "version": "v4.57.3",
+  "version": "v4.58.0",
   "description": "Installer for the fleetctl CLI tool",
   "bin": {
     "fleetctl": "./run.js"