diff --git a/.github/workflows/BuildThunder.sh b/.github/workflows/BuildThunder.sh
index f6621cc266..0b5d9533e8 100755
--- a/.github/workflows/BuildThunder.sh
+++ b/.github/workflows/BuildThunder.sh
@@ -8,9 +8,9 @@ set -e
 ############################
 # 1. Install Dependencies
 
-sudo apt install -y build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev libssl-dev
+sudo apt install -y build-essential pkg-config cmake ninja-build libusb-1.0-0-dev zlib1g-dev libssl-dev
 
-pip install jsonref
+pip install --break-system-packages jsonref
 
 ############################
 # 2. Build Thunder Tools
diff --git a/.github/workflows/L0-CloudStore-grpc.yml b/.github/workflows/L0-CloudStore-grpc.yml
index c554f882a8..69d04b282f 100644
--- a/.github/workflows/L0-CloudStore-grpc.yml
+++ b/.github/workflows/L0-CloudStore-grpc.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Generate coverage
         working-directory: ${{github.workspace}}
         run: |
-          lcov -c -o coverage.info -d build/grpcl0test
+          lcov -c -o coverage.info -d build/grpcl0test --ignore-errors mismatch
           genhtml -o coverage coverage.info
 
       - name: Upload artifacts
diff --git a/.github/workflows/L0-CloudStore.yml b/.github/workflows/L0-CloudStore.yml
index c88ba400e1..429033f3be 100644
--- a/.github/workflows/L0-CloudStore.yml
+++ b/.github/workflows/L0-CloudStore.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Generate coverage
         working-directory: ${{github.workspace}}
         run: |
-          lcov -c -o coverage.info -d build/cloudstorel0test
+          lcov -c -o coverage.info -d build/cloudstorel0test --ignore-errors mismatch
           genhtml -o coverage coverage.info
 
       - name: Upload artifacts
diff --git a/CloudStore/CMakeLists.txt b/CloudStore/CMakeLists.txt
index 2fa045ba00..a10c234f48 100644
--- a/CloudStore/CMakeLists.txt
+++ b/CloudStore/CMakeLists.txt
@@ -78,7 +78,9 @@ add_custom_target(protoc
 )
 add_dependencies(${PLUGIN_IMPLEMENTATION} protoc)
 
-target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE grpc++)
+find_package(gRPC CONFIG REQUIRED)
+target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE gRPC::grpc++)
+#set(GRPC_CPP_PLUGIN $<TARGET_FILE:gRPC::grpc_cpp_plugin>)
 find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin REQUIRED)
 
 add_custom_target(protoc-gen-grpc
diff --git a/CloudStore/grpc/l0test/CMakeLists.txt b/CloudStore/grpc/l0test/CMakeLists.txt
index 4f0b61c724..c6eb636adb 100644
--- a/CloudStore/grpc/l0test/CMakeLists.txt
+++ b/CloudStore/grpc/l0test/CMakeLists.txt
@@ -46,8 +46,9 @@ add_custom_target(protoc
 )
 add_dependencies(${PROJECT_NAME} protoc)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE grpc++)
-find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin REQUIRED)
+find_package(gRPC CONFIG REQUIRED)
+target_link_libraries(${PROJECT_NAME} PRIVATE gRPC::grpc++)
+set(GRPC_CPP_PLUGIN $<TARGET_FILE:gRPC::grpc_cpp_plugin>)
 
 add_custom_target(protoc-gen-grpc
         ${Protobuf_PROTOC_EXECUTABLE} --grpc_out ${CMAKE_CURRENT_BINARY_DIR} --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} -I ${CMAKE_CURRENT_SOURCE_DIR}/../secure_storage ${CMAKE_CURRENT_SOURCE_DIR}/../secure_storage/secure_storage.proto
diff --git a/CloudStore/grpc/l2test/CMakeLists.txt b/CloudStore/grpc/l2test/CMakeLists.txt
index e4a1d395e6..1823c83cac 100644
--- a/CloudStore/grpc/l2test/CMakeLists.txt
+++ b/CloudStore/grpc/l2test/CMakeLists.txt
@@ -41,8 +41,9 @@ add_custom_target(protoc
 )
 add_dependencies(${PROJECT_NAME} protoc)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE grpc++)
-find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin REQUIRED)
+find_package(gRPC CONFIG REQUIRED)
+target_link_libraries(${PROJECT_NAME} PRIVATE gRPC::grpc++)
+set(GRPC_CPP_PLUGIN $<TARGET_FILE:gRPC::grpc_cpp_plugin>)
 
 add_custom_target(protoc-gen-grpc
         ${Protobuf_PROTOC_EXECUTABLE} --grpc_out ${CMAKE_CURRENT_BINARY_DIR} --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} -I ${CMAKE_CURRENT_SOURCE_DIR}/../secure_storage ${CMAKE_CURRENT_SOURCE_DIR}/../secure_storage/secure_storage.proto