diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b05f6fd53d..eb98b82314b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 1.5.8 (2024-08-19)
+
+This release only updates aziot-edge and aziot-identity-service. The Docker images remain at 1.5.7.
+
+## aziot-edge
+### Bug fixes
+* Fix snap startup error ( [d950b62](https://github.com/Azure/iotedge/commit/d950b624e62063f2458dd1a9ca64371f73d8a045) )
+
+## aziot-identity-service
+### Bug fixes
+* Update snap base image and remove unnecessary config ( [c66b5c7](https://github.com/Azure/iot-identity-service/commit/c66b5c727ab7ec9726191c98c9d1509dab71be85) )
+
 # 1.5.7 (2024-08-12)
 
 ## Base image updates
@@ -10,19 +22,19 @@ The following Docker images were updated because their base images changed:
 
 ## Edge Hub
 ### Bug fixes
-- Correctly close & dispose SDK client when it fails to open ( [df2f019](https://github.com/Azure/iotedge/commit/df2f0191e77a9452f14006ae2de0c1bdbfbb0fcc) )
+* Correctly close & dispose SDK client when it fails to open ( [df2f019](https://github.com/Azure/iotedge/commit/df2f0191e77a9452f14006ae2de0c1bdbfbb0fcc) )
 
 ## aziot-edge
 ### Bug fixes
-- Fix docker-proxy startup issue in snaps @st3v3nmw ( [80e3465](https://github.com/Azure/iotedge/commit/80e3465c70a79893561a4b8ba432e0d5a37ace65) )
+* Fix docker-proxy startup issue in snaps @st3v3nmw ( [80e3465](https://github.com/Azure/iotedge/commit/80e3465c70a79893561a4b8ba432e0d5a37ace65) )
 
 ## aziot-identity-service
 ### OS support
-- Add support for Debian 12 (identity service only) ( [d1cf0f5](https://github.com/Azure/iot-identity-service/commit/d1cf0f5f3eca25560f5a0101491ac87bc6bf6a90) )
+* Add support for Debian 12 (identity service only) ( [d1cf0f5](https://github.com/Azure/iot-identity-service/commit/d1cf0f5f3eca25560f5a0101491ac87bc6bf6a90) )
 
 ### Bug fixes
-- Treat malformed key(pair) as missing in create-key(pair) code paths ( [0351353](https://github.com/Azure/iot-identity-service/commit/0351353d852f59a270c7e4cd585138ee00caa5d8) )
-- Update shlex dependency to patch security vulnerabilities ( [bcc83b4](https://github.com/Azure/iot-identity-service/commit/bcc83b4cc2bc858a085b11bb4095fc993f8be87d) )
+* Treat malformed key(pair) as missing in create-key(pair) code paths ( [0351353](https://github.com/Azure/iot-identity-service/commit/0351353d852f59a270c7e4cd585138ee00caa5d8) )
+* Update shlex dependency to patch security vulnerabilities ( [bcc83b4](https://github.com/Azure/iot-identity-service/commit/bcc83b4cc2bc858a085b11bb4095fc993f8be87d) )
 
 # 1.5.6 (2024-07-23)
 
diff --git a/edgelet/Cargo.lock b/edgelet/Cargo.lock
index 34be069df0e..043426c6cb1 100644
--- a/edgelet/Cargo.lock
+++ b/edgelet/Cargo.lock
@@ -127,7 +127,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 [[package]]
 name = "aziot-cert-client-async"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "aziot-cert-common-http",
  "aziot-key-common",
@@ -140,7 +140,7 @@ dependencies = [
 [[package]]
 name = "aziot-cert-common-http"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "aziot-key-common",
  "serde",
@@ -149,7 +149,7 @@ dependencies = [
 [[package]]
 name = "aziot-certd-config"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "cert-renewal",
  "hex",
@@ -192,7 +192,7 @@ dependencies = [
 [[package]]
 name = "aziot-identity-client-async"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "aziot-cert-common-http",
  "aziot-identity-common",
@@ -206,7 +206,7 @@ dependencies = [
 [[package]]
 name = "aziot-identity-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "aziot-key-common",
  "http-common",
@@ -217,7 +217,7 @@ dependencies = [
 [[package]]
 name = "aziot-identity-common-http"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "aziot-cert-common-http",
  "aziot-identity-common",
@@ -230,7 +230,7 @@ dependencies = [
 [[package]]
 name = "aziot-identityd-config"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "aziot-identity-common",
  "cert-renewal",
@@ -245,7 +245,7 @@ dependencies = [
 [[package]]
 name = "aziot-key-client"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "aziot-key-common",
  "aziot-key-common-http",
@@ -260,7 +260,7 @@ dependencies = [
 [[package]]
 name = "aziot-key-client-async"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "aziot-key-common",
  "aziot-key-common-http",
@@ -273,7 +273,7 @@ dependencies = [
 [[package]]
 name = "aziot-key-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "serde",
 ]
@@ -281,7 +281,7 @@ dependencies = [
 [[package]]
 name = "aziot-key-common-http"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "aziot-key-common",
  "http-common",
@@ -291,7 +291,7 @@ dependencies = [
 [[package]]
 name = "aziot-key-openssl-engine"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "aziot-key-client",
  "aziot-key-common",
@@ -309,7 +309,7 @@ dependencies = [
 [[package]]
 name = "aziot-keyd-config"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "http-common",
  "libc",
@@ -319,7 +319,7 @@ dependencies = [
 [[package]]
 name = "aziot-keys-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "pkcs11",
  "serde",
@@ -329,7 +329,7 @@ dependencies = [
 [[package]]
 name = "aziot-tpmd-config"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "http-common",
  "serde",
@@ -338,7 +338,7 @@ dependencies = [
 [[package]]
 name = "aziotctl-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "anyhow",
  "aziot-certd-config",
@@ -445,7 +445,7 @@ dependencies = [
 [[package]]
 name = "cert-renewal"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "async-trait",
  "chrono",
@@ -543,7 +543,7 @@ dependencies = [
 [[package]]
 name = "config-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "serde",
  "toml",
@@ -1200,7 +1200,7 @@ dependencies = [
 [[package]]
 name = "http-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "async-trait",
  "base64 0.21.2",
@@ -1500,7 +1500,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 [[package]]
 name = "logger"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "env_logger",
  "log",
@@ -1647,7 +1647,7 @@ dependencies = [
 [[package]]
 name = "openssl-build"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "cc",
 ]
@@ -1689,7 +1689,7 @@ dependencies = [
 [[package]]
 name = "openssl-sys2"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "openssl-build",
  "openssl-sys",
@@ -1698,7 +1698,7 @@ dependencies = [
 [[package]]
 name = "openssl2"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "foreign-types",
  "foreign-types-shared",
@@ -1758,7 +1758,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 [[package]]
 name = "pkcs11"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "foreign-types-shared",
  "lazy_static",
@@ -1775,7 +1775,7 @@ dependencies = [
 [[package]]
 name = "pkcs11-sys"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 
 [[package]]
 name = "pkg-config"
@@ -2224,7 +2224,7 @@ dependencies = [
 [[package]]
 name = "test-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#b6836b2c31ed8fed0e65c875cdf55267167f4e41"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#8daa5cd4adb81dfd72ef7eced624ec4a906913f2"
 dependencies = [
  "aziot-identity-common",
  "aziot-identity-common-http",
diff --git a/edgelet/contrib/debian/control b/edgelet/contrib/debian/control
index c87739daa1b..a3f0a316b7c 100644
--- a/edgelet/contrib/debian/control
+++ b/edgelet/contrib/debian/control
@@ -8,7 +8,7 @@ Homepage: https://github.com/azure/iotedge
 
 Package: aziot-edge
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, ca-certificates, hostname, psmisc, sed, aziot-identity-service (= 1.5.1-1)
+Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, ca-certificates, hostname, psmisc, sed, aziot-identity-service (= 1.5.2-1)
 Description: Azure IoT Edge Module Runtime
  Azure IoT Edge is a fully managed service that delivers cloud intelligence
  locally by deploying and running artificial intelligence (AI), Azure services,
diff --git a/edgelet/contrib/enterprise-linux/aziot-edge.spec b/edgelet/contrib/enterprise-linux/aziot-edge.spec
index 709733a6c73..66d4b40eabd 100644
--- a/edgelet/contrib/enterprise-linux/aziot-edge.spec
+++ b/edgelet/contrib/enterprise-linux/aziot-edge.spec
@@ -22,7 +22,7 @@ URL:            https://github.com/azure/iotedge
 BuildRequires:  systemd
 Requires(pre):  shadow-utils
 Requires:       (moby-engine or docker-ce)
-Requires:       aziot-identity-service = 1.5.1-1%{?dist}
+Requires:       aziot-identity-service = 1.5.2-1%{?dist}
 Source0:        aziot-edge-%{version}.tar.gz
 
 %description
diff --git a/edgelet/version.txt b/edgelet/version.txt
index f01291b87fd..1cc9c180e26 100644
--- a/edgelet/version.txt
+++ b/edgelet/version.txt
@@ -1 +1 @@
-1.5.7
+1.5.8