diff --git a/samples/psa/its/overlay-secure_storage.conf b/samples/psa/its/overlay-secure_storage.conf
index 9265b38ccc7..b3fcab84205 100644
--- a/samples/psa/its/overlay-secure_storage.conf
+++ b/samples/psa/its/overlay-secure_storage.conf
@@ -3,9 +3,9 @@
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 
-# The default stack size (1024) is not enough for the PSA Crypto core.
+# The default stack size is not enough for the PSA Crypto core.
 # On top of that, the ITS implementation uses the stack for buffers.
-CONFIG_MAIN_STACK_SIZE=3072
+CONFIG_MAIN_STACK_SIZE=4096
 
 CONFIG_SECURE_STORAGE=y
 CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y
diff --git a/samples/psa/persistent_key/overlay-secure_storage.conf b/samples/psa/persistent_key/overlay-secure_storage.conf
index c5cff5f364a..0b68451db29 100644
--- a/samples/psa/persistent_key/overlay-secure_storage.conf
+++ b/samples/psa/persistent_key/overlay-secure_storage.conf
@@ -5,9 +5,9 @@ CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_HEAP_SIZE=1024
 
-# The default stack size (1024) is not enough for the PSA Crypto core.
+# The default stack size is not enough for the PSA Crypto core.
 # On top of that, the ITS implementation uses the stack for buffers.
-CONFIG_MAIN_STACK_SIZE=3072
+CONFIG_MAIN_STACK_SIZE=4096
 
 CONFIG_SECURE_STORAGE=y
 CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS=y
diff --git a/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf b/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
index 6df091015be..97594a4ac44 100644
--- a/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
+++ b/tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf
@@ -1,5 +1,5 @@
-CONFIG_ZTEST_STACK_SIZE=3072
-CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_ZTEST_STACK_SIZE=4096
+CONFIG_MAIN_STACK_SIZE=3072
 
 CONFIG_MBEDTLS=y
 CONFIG_ENTROPY_GENERATOR=y