diff --git a/build/env b/build/env
index b6c1d24..7109826 160000
--- a/build/env
+++ b/build/env
@@ -1 +1 @@
-Subproject commit b6c1d249546b3920ae6d8197e330f9aaa110b344
+Subproject commit 7109826f81feb78a6c0c1dc74ce3945ece4bf67d
diff --git a/cmake b/cmake
index b13774d..13b7626 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit b13774ddc003e7a5d6a0116b594a9dbe7313851a
+Subproject commit 13b7626edc288ee41e200c1ad09f73cc950f666e
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8135e14..656c6a4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -68,7 +68,7 @@ SET(LINK_GENERATOR_SOURCES
 
 FIND_PACKAGE(Common REQUIRED)
 FIND_PACKAGE(FastoTvCPP REQUIRED)
-FIND_PACKAGE(JSON-C REQUIRED)
+FIND_PACKAGE(JSON-C CONFIG REQUIRED)
 
 # options
 IF(MACHINE_LEARNING)
@@ -129,7 +129,7 @@ SET(STREAMER_COMMON_SOURCES
 )
 SET(STREAMER_COMMON_LIBRARIES
   ${STREAMER_COMMON_LIBRARIES}
-  ${JSONC_LIBRARIES} utils
+  json-c::json-c utils
   ${COMMON_BASE_LIBRARY}
   ${FASTOTV_CPP_LIBRARIES}
   ${ZLIB_LIBRARIES}
@@ -182,8 +182,8 @@ IF(DEVELOPER_ENABLE_TESTS)
     ${CMAKE_SOURCE_DIR}/tests/unit_test_input_uri.cpp
     ${CMAKE_SOURCE_DIR}/tests/unit_test_types.cpp
   )
-  TARGET_INCLUDE_DIRECTORIES(${UNIT_TESTS} PRIVATE ${PRIVATE_INCLUDE_DIRECTORIES_UNIT_TESTS} ${JSONC_INCLUDE_DIRS})
-  TARGET_LINK_LIBRARIES(${UNIT_TESTS} ${UNIT_TESTS_LIBS})
+  TARGET_INCLUDE_DIRECTORIES(${UNIT_TESTS} PRIVATE ${PRIVATE_INCLUDE_DIRECTORIES_UNIT_TESTS})
+  TARGET_LINK_LIBRARIES(${UNIT_TESTS} ${UNIT_TESTS_LIBS} json-c::json-c)
   ADD_TEST_TARGET(${UNIT_TESTS})
   SET_PROPERTY(TARGET ${UNIT_TESTS} PROPERTY FOLDER "Unit tests")
 ENDIF(DEVELOPER_ENABLE_TESTS)