diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 8ce06536..e019e25c 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -112,8 +112,8 @@ jobs:
           RUSTFLAGS: "-C instrument-coverage"
           CC_x86_64_unknown_none: clang
           AR_x86_64_unknown_none: llvm-ar
-          RUN_REQUESTER_FEATURES: "spdm-mbedtls,hashed-transcript-data,spdm-mbedtls-hashed-transcript-data"
-          RUN_RESPONDER_FEATURES: "spdm-mbedtls,hashed-transcript-data,spdm-mbedtls-hashed-transcript-data"
+          RUN_REQUESTER_FEATURES: "spdm-mbedtls,hashed-transcript-data"
+          RUN_RESPONDER_FEATURES: "spdm-mbedtls,hashed-transcript-data"
         run: |
           ./sh_script/build.sh -r
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 99862a3c..07476d63 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,14 +25,14 @@ jobs:
             "spdm-ring",
             "spdm-ring,hashed-transcript-data",
             "spdm-mbedtls",
-            "spdm-mbedtls,hashed-transcript-data,spdm-mbedtls-hashed-transcript-data",
+            "spdm-mbedtls,hashed-transcript-data",
           ]
         run_responder_features:
           [
             "spdm-ring",
             "spdm-ring,hashed-transcript-data",
             "spdm-mbedtls",
-            "spdm-mbedtls,hashed-transcript-data,spdm-mbedtls-hashed-transcript-data",
+            "spdm-mbedtls,hashed-transcript-data",
           ]
         include:
           - runs-on: windows-latest
diff --git a/readme.md b/readme.md
index c5b8418f..0a3e8b5f 100644
--- a/readme.md
+++ b/readme.md
@@ -122,7 +122,7 @@ The following list shows the supported combinations for both spdm-requester-emu
 | spdm-ring                                                               | ring          | No                             | use ring as crypto library with hashed-transcript-data disabled    |
 | spdm-ring,hashed-transcript-data                                        | ring          | Yes                            | use ring as crypto library with hashed-transcript-data enabled     |
 | spdm-mbedtls                                                            | mbedtls       | No                             | use mbedtls as crypto library with hashed-transcript-data disabled |
-| spdm-mbedtls,hashed-transcript-data,spdm-mbedtls-hashed-transcript-data | mbedtls       | Yes                            | use mbedtls as crypto library with hashed-transcript-data          |
+| spdm-mbedtls,hashed-transcript-data | mbedtls       | Yes                            | use mbedtls as crypto library with hashed-transcript-data          |
 
 For example, run the emulator with spdm-ring enabled and without hashed-transcript-data enabled.  
 Open one command windows and run:
@@ -133,7 +133,7 @@ cargo run -p spdm-responder-emu --no-default-features --features "spdm-ring"
 run the emulator with spdm-mbedtls enabled and with hashed-transcript-data enabled.  
 Open another command windows and run:
 ```
-cargo run -p spdm-requester-emu --no-default-features --features "spdm-mbedtls,hashed-transcript-data,spdm-mbedtls-hashed-transcript-data"
+cargo run -p spdm-requester-emu --no-default-features --features "spdm-mbedtls,hashed-transcript-data"
 ```
 
 NOTE: In order to run the emu without hashed-transcript-data, please change `max_cert_chain_data_size` in `spdmlib/etc/config.json` from `4096` to `3500`.
diff --git a/test/spdm-emu/Cargo.toml b/test/spdm-emu/Cargo.toml
index 534ca2e9..f429e864 100644
--- a/test/spdm-emu/Cargo.toml
+++ b/test/spdm-emu/Cargo.toml
@@ -28,5 +28,4 @@ default = ["spdm-ring", "spdmlib/hashed-transcript-data"]
 mut-auth = ["spdmlib/mut-auth"]
 spdm-ring = ["spdmlib/spdm-ring", "spdmlib/std"]
 spdm-mbedtls = ["spdmlib_crypto_mbedtls"]
-hashed-transcript-data = ["spdmlib/hashed-transcript-data"]
-spdm-mbedtls-hashed-transcript-data = ["spdmlib_crypto_mbedtls/hashed-transcript-data"]
+hashed-transcript-data = ["spdmlib/hashed-transcript-data", "spdmlib_crypto_mbedtls?/hashed-transcript-data"]
diff --git a/test/spdm-requester-emu/Cargo.toml b/test/spdm-requester-emu/Cargo.toml
index b6c6e000..63524055 100644
--- a/test/spdm-requester-emu/Cargo.toml
+++ b/test/spdm-requester-emu/Cargo.toml
@@ -24,4 +24,3 @@ mut-auth = ["spdm-emu/mut-auth"]
 spdm-ring = ["spdm-emu/spdm-ring"]
 spdm-mbedtls = ["spdm-emu/spdm-mbedtls"]
 hashed-transcript-data = ["spdm-emu/hashed-transcript-data"]
-spdm-mbedtls-hashed-transcript-data = ["spdm-emu/spdm-mbedtls-hashed-transcript-data"]
diff --git a/test/spdm-responder-emu/Cargo.toml b/test/spdm-responder-emu/Cargo.toml
index 12165b16..81fbdd63 100644
--- a/test/spdm-responder-emu/Cargo.toml
+++ b/test/spdm-responder-emu/Cargo.toml
@@ -24,4 +24,3 @@ mut-auth = ["spdm-emu/mut-auth"]
 spdm-ring = ["spdm-emu/spdm-ring"]
 spdm-mbedtls = ["spdm-emu/spdm-mbedtls"]
 hashed-transcript-data = ["spdm-emu/hashed-transcript-data"]
-spdm-mbedtls-hashed-transcript-data = ["spdm-emu/spdm-mbedtls-hashed-transcript-data"]