diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0df46dc..5c55898 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 3.13)
 if(ESP_PLATFORM)
 set(DEBUG_APDU 1)
 set(DENABLE_POWER_ON_RESET 0)
-set(EXTRA_COMPONENT_DIRS pico-fido/src pico-keys-sdk/src pico-openpgp/src)
+set(EXTRA_COMPONENT_DIRS src/fido2 pico-keys-sdk/src)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 else()
 
@@ -77,7 +77,7 @@ else()
     set(USB_ITF_CCID 0)
 endif()
 
-set(SOURCES ${SOURCES}
+set(SOURCES
         ${CMAKE_CURRENT_LIST_DIR}/src/fido2/files.c
         ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/fido.c
         ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/kek.c
diff --git a/pico-fido b/pico-fido
index 9b75c5c..9c28f72 160000
--- a/pico-fido
+++ b/pico-fido
@@ -1 +1 @@
-Subproject commit 9b75c5c175a8ed263cf1ac7b3e5ddc92d5d23e24
+Subproject commit 9c28f72d176f94b5cc0fa0d7de5d7d38600631ff
diff --git a/pico-keys-sdk b/pico-keys-sdk
index eb75ad4..113e720 160000
--- a/pico-keys-sdk
+++ b/pico-keys-sdk
@@ -1 +1 @@
-Subproject commit eb75ad4efa36703ed5dc7aaed1779e97497febb1
+Subproject commit 113e720fcaaa6b9ca74d114bee1923bb2619ba3b
diff --git a/pico-openpgp b/pico-openpgp
index f34cdac..f2fe6dd 160000
--- a/pico-openpgp
+++ b/pico-openpgp
@@ -1 +1 @@
-Subproject commit f34cdac00b4c0c6515686f0b34d13065d1c9bcbd
+Subproject commit f2fe6dd5c2928fbdf9a7f46b5a06151ea4cef071