diff --git a/.github/workflows/BuildThunder.sh b/.github/workflows/BuildThunder.sh
index f6621cc266..a33d8ba87f 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_BREAK_SYSTEM_PACKAGES=1 pip install jsonref
 
 ############################
 # 2. Build Thunder Tools
diff --git a/CloudStore/CMakeLists.txt b/CloudStore/CMakeLists.txt
index 2fa045ba00..41979fc8dc 100644
--- a/CloudStore/CMakeLists.txt
+++ b/CloudStore/CMakeLists.txt
@@ -78,7 +78,13 @@ add_custom_target(protoc
 )
 add_dependencies(${PLUGIN_IMPLEMENTATION} protoc)
 
-target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE grpc++)
+find_package(gRPC CONFIG)
+if (gRPC_FOUND)
+    set(GRPC_LIBS gRPC::grpc++)
+else ()
+    set(GRPC_LIBS grpc++)
+endif ()
+target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${GRPC_LIBS})
 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..f48f9e5e14 100644
--- a/CloudStore/grpc/l0test/CMakeLists.txt
+++ b/CloudStore/grpc/l0test/CMakeLists.txt
@@ -46,7 +46,13 @@ add_custom_target(protoc
 )
 add_dependencies(${PROJECT_NAME} protoc)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE grpc++)
+find_package(gRPC CONFIG)
+if (gRPC_FOUND)
+    set(GRPC_LIBS gRPC::grpc++)
+else ()
+    set(GRPC_LIBS grpc++)
+endif ()
+target_link_libraries(${PROJECT_NAME} PRIVATE ${GRPC_LIBS})
 find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin REQUIRED)
 
 add_custom_target(protoc-gen-grpc
diff --git a/CloudStore/grpc/l2test/CMakeLists.txt b/CloudStore/grpc/l2test/CMakeLists.txt
index e4a1d395e6..59ab1682cc 100644
--- a/CloudStore/grpc/l2test/CMakeLists.txt
+++ b/CloudStore/grpc/l2test/CMakeLists.txt
@@ -41,7 +41,13 @@ add_custom_target(protoc
 )
 add_dependencies(${PROJECT_NAME} protoc)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE grpc++)
+find_package(gRPC CONFIG)
+if (gRPC_FOUND)
+    set(GRPC_LIBS gRPC::grpc++)
+else ()
+    set(GRPC_LIBS grpc++)
+endif ()
+target_link_libraries(${PROJECT_NAME} PRIVATE ${GRPC_LIBS})
 find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin REQUIRED)
 
 add_custom_target(protoc-gen-grpc