diff --git a/esp-storage/Cargo.toml b/esp-storage/Cargo.toml
index e49b6e399..ae1bd6f0d 100644
--- a/esp-storage/Cargo.toml
+++ b/esp-storage/Cargo.toml
@@ -12,22 +12,12 @@ license       = "MIT OR Apache-2.0"
 
 [package.metadata.espressif]
 check-configs = [
-    { features = [], append = [
-        { features = ["portable-atomic/unsafe-assume-single-core"], if = 'chip == "esp32c2" || chip == "esp32c3" || chip == "esp32s2"' }
-    ] },
-    { features = ["critical-section"], append = [
-        { features = ["portable-atomic/unsafe-assume-single-core"], if = 'chip == "esp32c2" || chip == "esp32c3" || chip == "esp32s2"' }
-    ] },
-    { features = ["bytewise-read"], append = [
-        { features = ["portable-atomic/unsafe-assume-single-core"], if = 'chip == "esp32c2" || chip == "esp32c3" || chip == "esp32s2"' }
-    ] },
-    { features = ["critical-section", "bytewise-read"], append = [
-        { features = ["portable-atomic/unsafe-assume-single-core"], if = 'chip == "esp32c2" || chip == "esp32c3" || chip == "esp32s2"' }
-    ] },
+    { features = [] },
+    { features = ["critical-section"] },
+    { features = ["bytewise-read"]},
+    { features = ["critical-section", "bytewise-read"] },
 ]
-clippy-configs = [{ features = ["critical-section", "bytewise-read"], append = [
-    { features = ["portable-atomic/unsafe-assume-single-core"], if = 'chip == "esp32c2" || chip == "esp32c3" || chip == "esp32s2"' }
-]}]
+clippy-configs = [{ features = ["critical-section", "bytewise-read"] }]
 
 [package.metadata.docs.rs]
 default-target = "riscv32imac-unknown-none-elf"
@@ -40,7 +30,6 @@ bench = false
 embedded-storage = "0.3.1"
 procmacros       = { version = "0.19.0", package = "esp-hal-procmacros", path = "../esp-hal-procmacros" }
 cfg-if           = "1.0.0"
-portable-atomic          = { version = "1.11.0", default-features = false }
 esp-hal = { version = "1.0.0-rc.0", path = "../esp-hal", default-features = false, optional = true}
 
 # Optional dependencies
diff --git a/qa-test/Cargo.toml b/qa-test/Cargo.toml
index 7b06e6b60..f0ac3ec1d 100644
--- a/qa-test/Cargo.toml
+++ b/qa-test/Cargo.toml
@@ -21,7 +21,6 @@ esp-backtrace = { path = "../esp-backtrace", features = [
     "panic-handler",
     "println",
 ] }
-critical-section   = "1.1.3"
 esp-bootloader-esp-idf = { path = "../esp-bootloader-esp-idf" }
 esp-hal = { path = "../esp-hal", features = ["log-04", "unstable"] }
 esp-hal-embassy = { path = "../esp-hal-embassy" }