diff --git a/libraries/dl-streamer/src/monolithic/gst/elements/CMakeLists.txt b/libraries/dl-streamer/src/monolithic/gst/elements/CMakeLists.txt
index ed00cdce1b..206514c48a 100644
--- a/libraries/dl-streamer/src/monolithic/gst/elements/CMakeLists.txt
+++ b/libraries/dl-streamer/src/monolithic/gst/elements/CMakeLists.txt
@@ -6,11 +6,12 @@
 
 set (TARGET_NAME "elements")
 
-find_package(OpenCV REQUIRED core imgproc)
+find_package(OpenCV REQUIRED core imgproc calib3d)
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(GSTREAMER gstreamer-1.0>=1.16 REQUIRED)
 pkg_check_modules(GSTVIDEO gstreamer-video-1.0>=1.16 REQUIRED)
 pkg_check_modules(GSTALLOC gstreamer-allocators-1.0 REQUIRED)
+pkg_search_module(VA va libva REQUIRED)
 if(${ENABLE_AUDIO_INFERENCE_ELEMENTS})
         pkg_check_modules(GSTAUDIO gstreamer-audio-1.0>=1.16 REQUIRED)
 endif()
@@ -24,6 +25,10 @@ file (GLOB MAIN_SRC
     gvawatermark/renderer/*.cpp
     gvawatermark/renderer/cpu/*.cpp
     gvawatermark/*.c
+    gvawatermark3d/*.cpp
+    gvawatermark3d/*.c
+    gvadeskew/*.cpp
+    gvadeskew/*.c
 )
 
 file (GLOB MAIN_HEADERS
@@ -32,6 +37,8 @@ file (GLOB MAIN_HEADERS
     gvawatermark/*.h
     gvawatermark/renderer/*.h
     gvawatermark/renderer/cpu/*.h
+    gvawatermark3d/*.h
+    gvadeskew/*.h
 )
 
 if(${ENABLE_AUDIO_INFERENCE_ELEMENTS})
@@ -55,6 +62,8 @@ PUBLIC
     gvawatermark
     gvawatermark/renderer
     gvametaaggregate
+    gvawatermark3d
+    gvadeskew
 PRIVATE
     ${GSTREAMER_INCLUDE_DIRS}
     ${GSTVIDEO_INCLUDE_DIRS}
@@ -100,8 +109,6 @@ add_subdirectory(gvaattachroi)
 add_subdirectory(gvametapublish)
 add_subdirectory(gvapython)
 add_subdirectory(gvatrack)
-add_subdirectory(gvadeskew)
-add_subdirectory(gvawatermark3d)
 add_subdirectory(gvamotiondetect)
 if(ENABLE_REALSENSE)
     add_subdirectory(gvarealsense)
diff --git a/libraries/dl-streamer/src/monolithic/gst/elements/gvadeskew/CMakeLists.txt b/libraries/dl-streamer/src/monolithic/gst/elements/gvadeskew/CMakeLists.txt
deleted file mode 100644
index e32d5aa6dd..0000000000
--- a/libraries/dl-streamer/src/monolithic/gst/elements/gvadeskew/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-# ==============================================================================
-# Copyright (C) 2021-2025 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-# ==============================================================================
-
-set(TARGET_NAME "gvadeskew")
-
-pkg_search_module(VA va libva REQUIRED)
-find_package(OpenCV REQUIRED core imgproc calib3d)
-
-file(GLOB DESKEW_SRC
-    *.cpp
-    *.c
-)
-
-file(GLOB DESKEW_HEADERS
-    *.h
-)
-
-add_library(gvadeskew SHARED gvadeskew.cpp gvadeskew.h)
-set_compile_flags(${TARGET_NAME})
-
-target_include_directories(${TARGET_NAME}
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-    PRIVATE
-        ${GSTREAMER_INCLUDE_DIRS}
-        ${GSTVIDEO_INCLUDE_DIRS}
-        ${GSTALLOC_INCLUDE_DIRS}
-)
-
-target_link_directories(${TARGET_NAME} PUBLIC ${VA_LIBRARY_DIRS})
-
-target_link_libraries(${TARGET_NAME}
-    PRIVATE
-        ${GSTREAMER_LIBRARIES}
-        ${GSTVIDEO_LIBRARIES}
-        ${GSTALLOC_LIBRARIES}
-        ${OpenCV_LIBS}
-        dlstreamer_api
-        common
-        image_inference
-        image_inference_openvino
-        logger
-        json-hpp
-        json-schema-validator
-        utils
-)
-
-# Optionally, add install rules if needed
\ No newline at end of file
diff --git a/libraries/dl-streamer/src/monolithic/gst/elements/gvadeskew/gvadeskew.cpp b/libraries/dl-streamer/src/monolithic/gst/elements/gvadeskew/gvadeskew.cpp
index 2cd23d202f..229b3e6776 100644
--- a/libraries/dl-streamer/src/monolithic/gst/elements/gvadeskew/gvadeskew.cpp
+++ b/libraries/dl-streamer/src/monolithic/gst/elements/gvadeskew/gvadeskew.cpp
@@ -419,7 +419,10 @@ static void gst_gvadeskew_init(GstGvaDeskew *self) {
 }
 
 static gboolean plugin_init(GstPlugin *plugin) {
-    return gst_element_register(plugin, "gvadeskew", GST_RANK_NONE, GST_TYPE_GVADESKEW);
+    if (!gst_element_register(plugin, "gvadeskew", GST_RANK_NONE, GST_TYPE_GVADESKEW))
+        return FALSE;
+
+    return TRUE;
 }
 
 GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, gvadeskew, PRODUCT_FULL_NAME " gvadeskew element", plugin_init,
diff --git a/libraries/dl-streamer/src/monolithic/gst/elements/gvawatermark3d/CMakeLists.txt b/libraries/dl-streamer/src/monolithic/gst/elements/gvawatermark3d/CMakeLists.txt
deleted file mode 100644
index 7f252f7c2e..0000000000
--- a/libraries/dl-streamer/src/monolithic/gst/elements/gvawatermark3d/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-# ==============================================================================
-# Copyright (C) 2021-2025 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-# ==============================================================================
-
-set(TARGET_NAME "gvawatermark3d")
-
-pkg_search_module(VA va libva REQUIRED)
-find_package(OpenCV REQUIRED core imgproc calib3d)
-
-file(GLOB WATERMARK3D_SRC
-    *.cpp
-    *.c
-)
-
-file(GLOB WATERMARK3D_HEADERS
-    *.h
-)
-
-add_library(gvawatermark3d SHARED gvawatermark3d.cpp gvawatermark3d.h)
-set_compile_flags(${TARGET_NAME})
-
-target_include_directories(${TARGET_NAME}
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-    PRIVATE
-        ${GSTREAMER_INCLUDE_DIRS}
-        ${GSTVIDEO_INCLUDE_DIRS}
-        ${GSTALLOC_INCLUDE_DIRS}
-)
-
-target_link_directories(${TARGET_NAME} PUBLIC ${VA_LIBRARY_DIRS})
-target_link_libraries(${TARGET_NAME}
-    PRIVATE
-        ${GSTREAMER_LIBRARIES}
-        ${GSTVIDEO_LIBRARIES}
-        ${GSTALLOC_LIBRARIES}
-        ${OpenCV_LIBS}
-        dlstreamer_api
-        common
-        image_inference
-        image_inference_openvino
-        logger
-        json-hpp
-        json-schema-validator
-        utils
-)
diff --git a/libraries/dl-streamer/src/monolithic/gst/elements/gvawatermark3d/gvawatermark3d.cpp b/libraries/dl-streamer/src/monolithic/gst/elements/gvawatermark3d/gvawatermark3d.cpp
index 39484b2ce1..1f634c1f87 100644
--- a/libraries/dl-streamer/src/monolithic/gst/elements/gvawatermark3d/gvawatermark3d.cpp
+++ b/libraries/dl-streamer/src/monolithic/gst/elements/gvawatermark3d/gvawatermark3d.cpp
@@ -303,15 +303,18 @@ static void gst_gvawatermark3d_init(GstGvaWatermark3D *self) {
     self->K = cv::Mat();
 }
 
-static gboolean plugin_init(GstPlugin *plugin) {
-    return gst_element_register(plugin, "gvawatermark3d", GST_RANK_NONE, GST_TYPE_GVAWATERMARK3D);
-}
-
 static void gst_gvawatermark3d_finalize(GObject *object) {
     GstGvaWatermark3D *self = GST_GVAWATERMARK3D(object);
     g_free(self->intrinsics_file);
     G_OBJECT_CLASS(gst_gvawatermark3d_parent_class)->finalize(object);
 }
 
+static gboolean plugin_init(GstPlugin *plugin) {
+    if (!gst_element_register(plugin, "gvawatermark3d", GST_RANK_NONE, GST_TYPE_GVAWATERMARK3D))
+        return FALSE;
+
+    return TRUE;
+}
+
 GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, gvawatermark3d, PRODUCT_FULL_NAME " gvawatermark3d element",
                   plugin_init, PLUGIN_VERSION, PLUGIN_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/libraries/dl-streamer/src/monolithic/gst/registrator/CMakeLists.txt b/libraries/dl-streamer/src/monolithic/gst/registrator/CMakeLists.txt
index ffdf45e793..49d79a3eb9 100644
--- a/libraries/dl-streamer/src/monolithic/gst/registrator/CMakeLists.txt
+++ b/libraries/dl-streamer/src/monolithic/gst/registrator/CMakeLists.txt
@@ -32,6 +32,8 @@ PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvametapublish/file/
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvatrack/
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvawatermark/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvawatermark3d/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvadeskew/
 )
 
 target_link_directories(${TARGET_NAME} PUBLIC ${VA_LIBRARY_DIRS})
diff --git a/libraries/dl-streamer/src/monolithic/gst/registrator/register_elements.cpp b/libraries/dl-streamer/src/monolithic/gst/registrator/register_elements.cpp
index cabe7301e4..a8866c7d4f 100644
--- a/libraries/dl-streamer/src/monolithic/gst/registrator/register_elements.cpp
+++ b/libraries/dl-streamer/src/monolithic/gst/registrator/register_elements.cpp
@@ -21,6 +21,8 @@
 #include "gstgvatrack.h"
 #include "gstgvawatermarkimpl.h"
 #include "gvawatermark.h"
+#include "gvawatermark3d.h"
+#include "gvadeskew.h"
 #include "inference_backend/logger.h"
 #include "logger_functions.h"
 
@@ -58,6 +60,10 @@ static gboolean plugin_init(GstPlugin *plugin) {
         return FALSE;
     if (!gst_element_register(plugin, "gvametaaggregate", GST_RANK_NONE, GST_TYPE_GVA_META_AGGREGATE))
         return FALSE;
+    if (!gst_element_register(plugin, "gvadeskew", GST_RANK_NONE, GST_TYPE_GVADESKEW))
+        return FALSE;
+    if (!gst_element_register(plugin, "gvawatermark3d", GST_RANK_NONE, GST_TYPE_GVAWATERMARK3D))
+        return FALSE;
 #if _MSC_VER
     if (!gst_element_register(plugin, "gvametapublish", GST_RANK_NONE, GST_TYPE_GVA_META_PUBLISH))
         return FALSE;