diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake
index ef555a5fd5..3c787e15a0 100644
--- a/cmake/kconfig.cmake
+++ b/cmake/kconfig.cmake
@@ -298,14 +298,10 @@ if(EXISTS ${BOARD_DEFCONFIG})
 	endif()
 
 	if(CRYPTO)
-		set(PX4_CRYPTO ${CRYPTO} CACHE STRING "PX4 crypto implementation" FORCE)
+		set(PX4_CRYPTO "1" CACHE INTERNAL "PX4 crypto implementation" FORCE)
 		add_definitions(-DPX4_CRYPTO)
 	endif()
 
-	if(KEYSTORE)
-		set(PX4_KEYSTORE ${KEYSTORE} CACHE STRING "PX4 keystore implementation" FORCE)
-	endif()
-
 	if(LINKER_PREFIX)
 		set(PX4_BOARD_LINKER_PREFIX ${LINKER_PREFIX} CACHE STRING "PX4 board linker prefix" FORCE)
 	else()