diff --git a/edgelet/Cargo.lock b/edgelet/Cargo.lock
index 0b50f9e3efc..d6858cf32b1 100644
--- a/edgelet/Cargo.lock
+++ b/edgelet/Cargo.lock
@@ -17,15 +17,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "aho-corasick"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "0.7.18"
@@ -87,7 +78,7 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 [[package]]
 name = "aziot-cert-client-async"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "aziot-cert-common-http",
  "aziot-key-common",
@@ -100,7 +91,7 @@ dependencies = [
 [[package]]
 name = "aziot-cert-common-http"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "aziot-key-common",
  "serde",
@@ -109,7 +100,7 @@ dependencies = [
 [[package]]
 name = "aziot-certd-config"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "hex 0.4.3",
  "http-common",
@@ -149,7 +140,7 @@ dependencies = [
 [[package]]
 name = "aziot-identity-client-async"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "aziot-cert-common-http",
  "aziot-identity-common",
@@ -163,7 +154,7 @@ dependencies = [
 [[package]]
 name = "aziot-identity-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "aziot-key-common",
  "http-common",
@@ -173,7 +164,7 @@ dependencies = [
 [[package]]
 name = "aziot-identity-common-http"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "aziot-cert-common-http",
  "aziot-identity-common",
@@ -187,7 +178,7 @@ dependencies = [
 [[package]]
 name = "aziot-identityd-config"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "aziot-identity-common",
  "http-common",
@@ -199,7 +190,7 @@ dependencies = [
 [[package]]
 name = "aziot-key-client"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "aziot-key-common",
  "aziot-key-common-http",
@@ -214,7 +205,7 @@ dependencies = [
 [[package]]
 name = "aziot-key-client-async"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "aziot-key-common",
  "aziot-key-common-http",
@@ -227,7 +218,7 @@ dependencies = [
 [[package]]
 name = "aziot-key-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "serde",
 ]
@@ -235,7 +226,7 @@ dependencies = [
 [[package]]
 name = "aziot-key-common-http"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "aziot-key-common",
  "http-common",
@@ -245,7 +236,7 @@ dependencies = [
 [[package]]
 name = "aziot-key-openssl-engine"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "aziot-key-client",
  "aziot-key-common",
@@ -263,7 +254,7 @@ dependencies = [
 [[package]]
 name = "aziot-keyd-config"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "http-common",
  "libc",
@@ -273,7 +264,7 @@ dependencies = [
 [[package]]
 name = "aziot-keys-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "pkcs11",
  "serde",
@@ -283,7 +274,7 @@ dependencies = [
 [[package]]
 name = "aziot-tpmd-config"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "http-common",
  "serde",
@@ -292,7 +283,7 @@ dependencies = [
 [[package]]
 name = "aziotctl-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "anyhow",
  "aziot-certd-config",
@@ -306,6 +297,7 @@ dependencies = [
  "nix",
  "serde",
  "serde_json",
+ "serde_with",
  "url 2.2.2",
 ]
 
@@ -483,7 +475,7 @@ dependencies = [
 [[package]]
 name = "config-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "serde",
  "toml",
@@ -723,7 +715,7 @@ dependencies = [
  "log",
  "nix",
  "percent-encoding 2.1.0",
- "regex 1.5.4",
+ "regex",
  "serde",
  "serde_json",
  "support-bundle",
@@ -761,7 +753,7 @@ dependencies = [
  "nix",
  "openssl",
  "percent-encoding 2.1.0",
- "regex 1.5.4",
+ "regex",
  "serde",
  "serde_json",
  "tokio",
@@ -823,14 +815,14 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "env_logger"
-version = "0.8.4"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
 dependencies = [
  "atty",
  "humantime",
  "log",
- "regex 1.5.4",
+ "regex",
  "termcolor 1.1.2",
 ]
 
@@ -1148,7 +1140,7 @@ dependencies = [
 [[package]]
 name = "http-common"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "async-trait",
  "base64 0.13.0",
@@ -1335,7 +1327,7 @@ dependencies = [
  "log",
  "nix",
  "openssl",
- "regex 0.2.11",
+ "regex",
  "serde",
  "serde_derive",
  "serde_json",
@@ -1427,7 +1419,7 @@ dependencies = [
 [[package]]
 name = "logger"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "env_logger",
  "log",
@@ -1598,7 +1590,7 @@ dependencies = [
 [[package]]
 name = "openssl-build"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "cc",
 ]
@@ -1629,7 +1621,7 @@ dependencies = [
 [[package]]
 name = "openssl-sys2"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "openssl-build",
  "openssl-sys",
@@ -1638,7 +1630,7 @@ dependencies = [
 [[package]]
 name = "openssl2"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "foreign-types",
  "foreign-types-shared",
@@ -1700,7 +1692,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 [[package]]
 name = "pkcs11"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 dependencies = [
  "foreign-types-shared",
  "lazy_static",
@@ -1717,7 +1709,7 @@ dependencies = [
 [[package]]
 name = "pkcs11-sys"
 version = "0.1.0"
-source = "git+https://github.com/Azure/iot-identity-service?branch=main#93bf692ee1bc9a888c3787235086bc03454c56dc"
+source = "git+https://github.com/Azure/iot-identity-service?branch=main#0205caebafa32852befbc34297a8434f97168b9d"
 
 [[package]]
 name = "pkg-config"
@@ -1872,37 +1864,15 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "regex"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
-dependencies = [
- "aho-corasick 0.6.10",
- "memchr",
- "regex-syntax 0.5.6",
- "thread_local",
- "utf8-ranges",
-]
-
 [[package]]
 name = "regex"
 version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
- "aho-corasick 0.7.18",
+ "aho-corasick",
  "memchr",
- "regex-syntax 0.6.25",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
-dependencies = [
- "ucd-util",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -2089,7 +2059,7 @@ dependencies = [
  "failure",
  "futures 0.3.17",
  "hyper",
- "regex 1.5.4",
+ "regex",
  "tempfile",
  "tokio",
  "zip",
@@ -2226,15 +2196,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "thread_local"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-dependencies = [
- "lazy_static",
-]
-
 [[package]]
 name = "time"
 version = "0.1.43"
@@ -2394,12 +2355,6 @@ version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
 
-[[package]]
-name = "ucd-util"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236"
-
 [[package]]
 name = "unicode-bidi"
 version = "0.3.7"
@@ -2451,12 +2406,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "utf8-ranges"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
diff --git a/edgelet/iotedge/Cargo.toml b/edgelet/iotedge/Cargo.toml
index a09a0ca8bf6..cc70f99b558 100644
--- a/edgelet/iotedge/Cargo.toml
+++ b/edgelet/iotedge/Cargo.toml
@@ -26,7 +26,7 @@ libc = "0.2"
 log = "0.4"
 nix = "0.23"
 openssl = "0.10"
-regex = "0.2"
+regex = "1"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"