diff --git a/socs/nrf9160_ns.conf b/socs/nrf9160_ns.conf
index 3d0cef9..ed83383 100644
--- a/socs/nrf9160_ns.conf
+++ b/socs/nrf9160_ns.conf
@@ -28,6 +28,7 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 # Disable options y-selected by NCS for no good reason
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
+CONFIG_MBEDTLS_PK_PARSE_EC_EXTENDED=n
 
 # MbedTLS configuration to support p-384 curve. These options
 # enable using the MbedTLS built-in support for operations not
diff --git a/west.yml b/west.yml
index f6bf85e..5e02182 100644
--- a/west.yml
+++ b/west.yml
@@ -7,7 +7,7 @@ manifest:
   projects:
     - name: golioth
       path: modules/lib/golioth-firmware-sdk
-      revision: v0.18.1
+      revision: v0.21.0
       url: https://github.com/golioth/golioth-firmware-sdk.git
       west-commands: scripts/west-commands.yml
       submodules: true
@@ -17,7 +17,7 @@ manifest:
         name-allowlist:
           - nrf
           - zephyr
-          - cmsis
+          - cmsis_6
           - hal_nordic
           - mbedtls
           - mbedtls-nrf