diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..c7b23a3d
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+# @global-owner1 and @global-owner2 will be requested for
+# review when someone opens a pull request.
+*       @rdkcentral/xdialserver-maintainers
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 7c56967d..c506e0d7 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -27,6 +27,7 @@ find_package (PkgConfig REQUIRED)
 pkg_search_module (GLIB REQUIRED glib-2.0)
 pkg_search_module (GIO REQUIRED gio-2.0)
 pkg_search_module (GSSDP12 gssdp-1.2)
+pkg_search_module (LIBSOUP3 libsoup-3.0)
 if (GSSDP12_FOUND)
   pkg_search_module (GSSDP REQUIRED gssdp-1.2)
   add_definitions(-DHAVE_GSSDP_VERSION_1_2_OR_NEWER)
@@ -34,7 +35,12 @@ if (GSSDP12_FOUND)
 else()
   pkg_search_module (GSSDP REQUIRED gssdp-1.0)
 endif()
-pkg_search_module (SOUP REQUIRED libsoup-2.4)
+if (LIBSOUP3_FOUND)
+  pkg_search_module (SOUP REQUIRED libsoup-3.0)
+  message("Using libsoup-3.0")
+else()
+  pkg_search_module (SOUP REQUIRED libsoup-2.4)
+endif()
 pkg_search_module (XML2 REQUIRED libxml-2.0)
 
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g")
@@ -101,4 +107,4 @@ target_link_libraries (gdial-server
 
 add_executable (gdial-server-ut gdialserver_ut.cpp)
 
-target_link_libraries (gdial-server-ut gdial-plat gdial-server)
\ No newline at end of file
+target_link_libraries (gdial-server-ut gdial-plat gdial-server)