diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
index a364f1a8f6..8afc13b113 100644
--- a/config/nrfconnect/chip-module/Kconfig.defaults
+++ b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -229,6 +229,7 @@ config IEEE802154_NRF5_RX_STACK_SIZE
     default 1024
 
 config OPENTHREAD_THREAD_STACK_SIZE
+    default 6144 if PSA_CRYPTO_DRIVER_CC3XX && PSA_CRYPTO_DRIVER_OBERON
     default 4096
 
 config OPENTHREAD_DEFAULT_TX_POWER
@@ -318,6 +319,14 @@ config PSA_WANT_ALG_SHA_224
 config MBEDTLS_PSA_KEY_SLOT_COUNT
     default 64
 
+if PSA_CRYPTO_DRIVER_CC3XX && PSA_CRYPTO_DRIVER_OBERON
+
+# Do not use CC3XX hash driver when both Oberon and CC3xx are enabled.
+config PSA_USE_CC3XX_HASH_DRIVER
+    default n
+
+endif
+
 endif
 
 if !CHIP_CRYPTO_PSA
diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
index 59e62cee24..4a9704d8d3 100644
--- a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
+++ b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
@@ -215,7 +215,7 @@
 #endif // CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY
 
 #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE
-#ifdef CONFIG_LTO
+#if defined(CONFIG_LTO) || (defined(CONFIG_PSA_CRYPTO_DRIVER_CC3XX) && defined(CONFIG_PSA_CRYPTO_DRIVER_OBERON))
 #define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 8192
 #else
 #define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 6144