diff --git a/components/esp_hw_support/port/esp32c3/esp_hmac.c b/components/esp_hw_support/port/esp32c3/esp_hmac.c
index 0d51b82148..cb18b5fd9b 100644
--- a/components/esp_hw_support/port/esp32c3/esp_hmac.c
+++ b/components/esp_hw_support/port/esp32c3/esp_hmac.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -159,7 +159,7 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
 
     ESP_LOGD(TAG, "HMAC computation in downstream mode is completed.");
 
-    ets_hmac_disable();
+    periph_module_disable(PERIPH_HMAC_MODULE);
 
     esp_crypto_hmac_lock_release();
 
@@ -169,9 +169,9 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
 esp_err_t esp_hmac_jtag_disable()
 {
     esp_crypto_hmac_lock_acquire();
-    ets_hmac_enable();
+    periph_module_enable(PERIPH_HMAC_MODULE);
     REG_SET_BIT(HMAC_SET_INVALIDATE_JTAG_REG, HMAC_INVALIDATE_JTAG);
-    ets_hmac_disable();
+    periph_module_disable(PERIPH_HMAC_MODULE);
     esp_crypto_hmac_lock_release();
 
     ESP_LOGD(TAG, "Invalidate JTAG result register. JTAG disabled.");
diff --git a/components/esp_hw_support/port/esp32h2/esp_hmac.c b/components/esp_hw_support/port/esp32h2/esp_hmac.c
index 5ff9520aec..d9da4b18c5 100644
--- a/components/esp_hw_support/port/esp32h2/esp_hmac.c
+++ b/components/esp_hw_support/port/esp32h2/esp_hmac.c
@@ -159,7 +159,7 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
 
     ESP_LOGD(TAG, "HMAC computation in downstream mode is completed.");
 
-    ets_hmac_disable();
+    periph_module_disable(PERIPH_HMAC_MODULE);
 
     esp_crypto_hmac_lock_release();
 
@@ -169,9 +169,9 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
 esp_err_t esp_hmac_jtag_disable()
 {
     esp_crypto_hmac_lock_acquire();
-    ets_hmac_enable();
+    periph_module_enable(PERIPH_HMAC_MODULE);
     REG_SET_BIT(HMAC_SET_INVALIDATE_JTAG_REG, HMAC_INVALIDATE_JTAG);
-    ets_hmac_disable();
+    periph_module_disable(PERIPH_HMAC_MODULE);
     esp_crypto_hmac_lock_release();
 
     ESP_LOGD(TAG, "Invalidate JTAG result register. JTAG disabled.");
diff --git a/components/esp_hw_support/port/esp32s3/esp_hmac.c b/components/esp_hw_support/port/esp32s3/esp_hmac.c
index 21df51a33a..29d9334ba5 100644
--- a/components/esp_hw_support/port/esp32s3/esp_hmac.c
+++ b/components/esp_hw_support/port/esp32s3/esp_hmac.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -160,7 +160,7 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
 
     ESP_LOGD(TAG, "HMAC computation in downstream mode is completed.");
 
-    ets_hmac_disable();
+    periph_module_disable(PERIPH_HMAC_MODULE);
 
     esp_crypto_hmac_lock_release();
 
@@ -170,9 +170,9 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
 esp_err_t esp_hmac_jtag_disable()
 {
     esp_crypto_hmac_lock_acquire();
-    ets_hmac_enable();
-    REG_SET_BIT(HMAC_SET_INVALIDATE_JTAG_REG, HMAC_INVALIDATE_JTAG);
-    ets_hmac_disable();
+    periph_module_enable(PERIPH_HMAC_MODULE);
+    REG_WRITE(HMAC_SET_INVALIDATE_JTAG_REG, 1);
+    periph_module_disable(PERIPH_HMAC_MODULE);
     esp_crypto_hmac_lock_release();
 
     ESP_LOGD(TAG, "Invalidate JTAG result register. JTAG disabled.");