diff --git a/docker/fedora41/fedora41.Dockerfile b/docker/fedora41/fedora41.Dockerfile
index 9640f8ab..71537579 100644
--- a/docker/fedora41/fedora41.Dockerfile
+++ b/docker/fedora41/fedora41.Dockerfile
@@ -67,7 +67,7 @@ RUN \
     python3-gobject-devel python3-devel tbb gnupg2 unzip gflags-devel openssl-devel openssl-devel-engine \
     gobject-introspection-devel x265-devel x264-devel libde265-devel libgudev-devel libusb1 libusb1-devel nasm python3-virtualenv \
     cairo-devel cairo-gobject-devel libXt-devel mesa-libGLES-devel wayland-protocols-devel libcurl-devel which \
-    libssh2-devel cmake git valgrind numactl libvpx-devel opus-devel libsrtp-devel libXv-devel paho-c-devel \
+    libssh2-devel cmake git valgrind numactl libvpx-devel opus-devel libsrtp-devel libXv-devel paho-c-devel ocl-icd-devel \
     kernel-headers pmix pmix-devel hwloc hwloc-libs hwloc-devel libxcb-devel libX11-devel libatomic intel-media-driver libsoup3 && \
     dnf clean all
 
diff --git a/src/monolithic/gst/elements/CMakeLists.txt b/src/monolithic/gst/elements/CMakeLists.txt
index b8c3d606..b8abc503 100644
--- a/src/monolithic/gst/elements/CMakeLists.txt
+++ b/src/monolithic/gst/elements/CMakeLists.txt
@@ -6,12 +6,15 @@
 
 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(NOT MSVC)
+  pkg_check_modules(GSTVA REQUIRED IMPORTED_TARGET gstreamer-va-1.0)
+endif()
 if(${ENABLE_AUDIO_INFERENCE_ELEMENTS})
         pkg_check_modules(GSTAUDIO gstreamer-audio-1.0>=1.16 REQUIRED)
 endif()
@@ -31,6 +34,13 @@ file (GLOB MAIN_SRC
     gvadeskew/*.c
 )
 
+# gvamotiondetect platform-specific source
+if(MSVC OR WIN32)
+    list(APPEND MAIN_SRC gvamotiondetect/gvamotiondetect_win.cpp)
+else()
+    list(APPEND MAIN_SRC gvamotiondetect/gvamotiondetect.cpp)
+endif()
+
 file (GLOB MAIN_HEADERS
     gvametaconvert/*.h
     gvametaaggregate/*.h
@@ -39,6 +49,7 @@ file (GLOB MAIN_HEADERS
     gvawatermark/renderer/cpu/*.h
     gvawatermark3d/*.h
     gvadeskew/*.h
+    gvamotiondetect/*.h
 )
 
 if(${ENABLE_AUDIO_INFERENCE_ELEMENTS})
@@ -64,6 +75,7 @@ PUBLIC
     gvametaaggregate
     gvawatermark3d
     gvadeskew
+    gvamotiondetect
 PRIVATE
     ${GSTREAMER_INCLUDE_DIRS}
     ${GSTVIDEO_INCLUDE_DIRS}
@@ -91,8 +103,17 @@ PRIVATE
     json-hpp
     json-schema-validator
     utils
+    dlstreamer_gst_meta
+    gstvideoanalyticsmeta
 )
 
+if(NOT MSVC)
+    target_link_libraries(${TARGET_NAME} PRIVATE
+        ${GSTVA_LIBRARIES}
+        dlstreamer_vaapi
+    )
+endif()
+
 if(${ENABLE_AUDIO_INFERENCE_ELEMENTS})
         target_link_libraries(${TARGET_NAME} PRIVATE ${GSTAUDIO_LIBRARIES})
 endif()
@@ -109,7 +130,6 @@ add_subdirectory(gvaattachroi)
 add_subdirectory(gvametapublish)
 add_subdirectory(gvapython)
 add_subdirectory(gvatrack)
-add_subdirectory(gvamotiondetect)
 if(ENABLE_REALSENSE)
     add_subdirectory(gvarealsense)
 endif()
diff --git a/src/monolithic/gst/elements/gvamotiondetect/CMakeLists.txt b/src/monolithic/gst/elements/gvamotiondetect/CMakeLists.txt
deleted file mode 100644
index 71b18236..00000000
--- a/src/monolithic/gst/elements/gvamotiondetect/CMakeLists.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-# ==============================================================================
-# Copyright (C) 2021-2025 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-# ==============================================================================
-
-cmake_minimum_required(VERSION 3.16)
-include(GNUInstallDirs)
-find_package(PkgConfig REQUIRED)
-
-pkg_check_modules(GST REQUIRED IMPORTED_TARGET gstreamer-1.0 gstreamer-base-1.0 gstreamer-video-1.0)
-if(NOT MSVC)
-  pkg_check_modules(GSTVA REQUIRED IMPORTED_TARGET gstreamer-va-1.0)
-endif()
-
-# Minimal source: plugin implementation only (no large inference converter bundle).
-set(GVAMD_EXTRA_SOURCES ${CMAKE_SOURCE_DIR}/src/utils/utils.cpp ${CMAKE_SOURCE_DIR}/src/monolithic/inference_backend/logger/logger.cpp ${CMAKE_SOURCE_DIR}/src/monolithic/inference_backend/logger/perf_logger.cpp)
-
-if(MSVC OR WIN32)
-  set(GVAMD_MAIN_SOURCE gvamotiondetect_win.cpp)
-else()
-  set(GVAMD_MAIN_SOURCE gvamotiondetect.cpp)
-endif()
-
-add_library(gstgvamotiondetect MODULE ${GVAMD_MAIN_SOURCE} ${GVAMD_EXTRA_SOURCES})
-
-if(MSVC)
-  # Use generator expressions so MSVC multi-config builds place DLL at:
-  #   <build>/intel64/<Config>/bin/<Config>/gstgvamotiondetect.dll
-  # Import lib (.lib) at:
-  #   <build>/intel64/<Config>/lib/<Config>/gstgvamotiondetect.lib
-  set_target_properties(gstgvamotiondetect PROPERTIES
-    PREFIX ""
-    OUTPUT_NAME "gstgvamotiondetect"
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intel64/$<CONFIG>/bin/$<CONFIG>"
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intel64/$<CONFIG>/bin/$<CONFIG>"
-    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intel64/$<CONFIG>/lib/$<CONFIG>"
-  )
-else()
-  set_target_properties(gstgvamotiondetect PROPERTIES OUTPUT_NAME "gvamotiondetect" PREFIX "libgst")
-endif()
-
-# Disable ITT notify API to avoid linking against external instrumentation library
-target_compile_definitions(gstgvamotiondetect PRIVATE INTEL_NO_ITTNOTIFY_API)
-
-target_include_directories(gstgvamotiondetect PRIVATE
-  ${PROJECT_SOURCE_DIR}/include
-  ${GST_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/include/dlstreamer/gst/videoanalytics/
-  ${CMAKE_SOURCE_DIR}/src/utils/
-  ${CMAKE_SOURCE_DIR}/src/monolithic/inference_backend/include/
-  ${CMAKE_SOURCE_DIR}/thirdparty/itt/include  # restore ITT header path for ENABLE_ITT builds
-)
-
-target_link_libraries(gstgvamotiondetect PRIVATE PkgConfig::GST dlstreamer_gst dlstreamer_gst_meta gstvideoanalyticsmeta)
-
-if(NOT MSVC)
-  # VAAPI / GstVA only for non-Windows builds
-  target_link_libraries(gstgvamotiondetect PRIVATE
-    PkgConfig::GSTVA
-    dlstreamer_vaapi
-  )
-endif()
-
-if(NOT MSVC)
-  pkg_check_modules(LIBVA QUIET IMPORTED_TARGET libva)
-  if (LIBVA_FOUND)
-    target_link_libraries(gstgvamotiondetect PRIVATE PkgConfig::LIBVA)
-  else()
-    find_library(LIBVA_LIB va)
-    if (LIBVA_LIB)
-      target_link_libraries(gstgvamotiondetect PRIVATE ${LIBVA_LIB})
-    endif()
-  endif()
-endif()
-
-find_package(OpenCL QUIET)
-if (OpenCL_FOUND)
-  target_link_libraries(gstgvamotiondetect PRIVATE OpenCL::OpenCL)
-  target_compile_definitions(gstgvamotiondetect PRIVATE HAVE_OPENCL_LOADER=1)
-endif()
-
-find_package(OpenCV QUIET COMPONENTS core imgproc)
-if (OpenCV_FOUND)
-  target_include_directories(gstgvamotiondetect PRIVATE ${OpenCV_INCLUDE_DIRS})
-  target_link_libraries(gstgvamotiondetect PRIVATE ${OpenCV_LIBS})
-  target_compile_definitions(gstgvamotiondetect PRIVATE HAVE_OPENCV=1)
-endif()
-
-install(TARGETS gstgvamotiondetect
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gstreamer-1.0
-)
diff --git a/src/monolithic/gst/elements/gvamotiondetect/gvamotiondetect.cpp b/src/monolithic/gst/elements/gvamotiondetect/gvamotiondetect.cpp
index 23cc4333..c2998a1c 100644
--- a/src/monolithic/gst/elements/gvamotiondetect/gvamotiondetect.cpp
+++ b/src/monolithic/gst/elements/gvamotiondetect/gvamotiondetect.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2025 Intel Corporation
+ * Copyright (C) 2025-2026 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  ******************************************************************************/
@@ -275,7 +275,7 @@ static GstCaps *gst_gva_motion_detect_transform_caps(GstBaseTransform *, GstPadD
 // -----------------------------------------------------------------------------
 // VA API helper functions
 // Map GST buffer to VA surface (using mapper + fallback) and return VASurfaceID
-static VASurfaceID gva_motion_detect_get_surface(GstGvaMotionDetect *self, GstBuffer *buf) {
+static VASurfaceID gva_motion_detect_get_surface([[maybe_unused]] GstGvaMotionDetect *self, GstBuffer *buf) {
     if (!buf)
         return VA_INVALID_SURFACE;
     VASurfaceID sid = gst_va_buffer_get_surface(buf);
@@ -308,8 +308,8 @@ static bool gva_motion_detect_convert_from_surface(GstGvaMotionDetect *self, VAS
 }
 
 // Write cv::UMat back into the VA surface; returns false on failure
-static bool gva_motion_detect_write_to_surface(GstGvaMotionDetect *self, const cv::UMat &src, VASurfaceID sid,
-                                               int width, int height) {
+[[maybe_unused]] static bool gva_motion_detect_write_to_surface(GstGvaMotionDetect *self, const cv::UMat &src,
+                                                                VASurfaceID sid, int width, int height) {
     if (sid == VA_INVALID_SURFACE || !self->va_dpy)
         return false;
     try {
@@ -453,7 +453,8 @@ static gboolean gst_gva_motion_detect_start(GstBaseTransform *trans) {
     return TRUE;
 }
 
-static gboolean gst_gva_motion_detect_set_caps(GstBaseTransform *trans, GstCaps *incaps, GstCaps *outcaps) {
+static gboolean gst_gva_motion_detect_set_caps(GstBaseTransform *trans, GstCaps *incaps,
+                                               [[maybe_unused]] GstCaps *outcaps) {
     GstGvaMotionDetect *self = GST_GVA_MOTION_DETECT(trans);
     if (!gst_video_info_from_caps(&self->vinfo, incaps))
         return FALSE;
@@ -1115,10 +1116,3 @@ static void gst_gva_motion_detect_process_and_attach(GstGvaMotionDetect *self, G
     if (!stable.empty())
         gst_gva_motion_detect_attach_rois(self, buf, stable, width, height);
 }
-
-static gboolean plugin_init(GstPlugin *plugin) {
-    return gst_element_register(plugin, "gvamotiondetect", GST_RANK_NONE, GST_TYPE_GVA_MOTION_DETECT);
-}
-
-GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, gvamotiondetect, PRODUCT_FULL_NAME " gvamotiondetect element",
-                  plugin_init, PLUGIN_VERSION, PLUGIN_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/src/monolithic/gst/elements/gvamotiondetect/gvamotiondetect_win.cpp b/src/monolithic/gst/elements/gvamotiondetect/gvamotiondetect_win.cpp
index 421fe395..354530c0 100644
--- a/src/monolithic/gst/elements/gvamotiondetect/gvamotiondetect_win.cpp
+++ b/src/monolithic/gst/elements/gvamotiondetect/gvamotiondetect_win.cpp
@@ -1,11 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2025 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- ******************************************************************************/
-
-/*******************************************************************************
- * Copyright (C) 2025 Intel Corporation
+ * Copyright (C) 2025-2026 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  ******************************************************************************/
@@ -573,10 +567,3 @@ static void gst_gva_motion_detect_init(GstGvaMotionDetect *self) {
     self->frame_index = 0;
     g_mutex_init(&self->meta_mutex);
 }
-
-static gboolean plugin_init(GstPlugin *plugin) {
-    return gst_element_register(plugin, "gvamotiondetect", GST_RANK_NONE, GST_TYPE_GVA_MOTION_DETECT);
-}
-
-GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, gvamotiondetect, PRODUCT_FULL_NAME " gvamotiondetect element",
-                  plugin_init, PLUGIN_VERSION, PLUGIN_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/src/monolithic/gst/registrator/CMakeLists.txt b/src/monolithic/gst/registrator/CMakeLists.txt
index 3b9d8f0d..30b93d4d 100644
--- a/src/monolithic/gst/registrator/CMakeLists.txt
+++ b/src/monolithic/gst/registrator/CMakeLists.txt
@@ -34,6 +34,7 @@ PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvatrack/
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvawatermark/
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvawatermark3d/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvamotiondetect/
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvadeskew/
 )
 
diff --git a/src/monolithic/gst/registrator/register_elements.cpp b/src/monolithic/gst/registrator/register_elements.cpp
index 601a72f1..cc317077 100644
--- a/src/monolithic/gst/registrator/register_elements.cpp
+++ b/src/monolithic/gst/registrator/register_elements.cpp
@@ -22,6 +22,7 @@
 #include "gstgvatrack.h"
 #include "gstgvawatermarkimpl.h"
 #include "gvadeskew.h"
+#include "gvamotiondetect.h"
 #include "gvawatermark.h"
 #include "gvawatermark3d.h"
 #include "inference_backend/logger.h"
@@ -67,6 +68,8 @@ static gboolean plugin_init(GstPlugin *plugin) {
         return FALSE;
     if (!gst_element_register(plugin, "gvawatermark3d", GST_RANK_NONE, GST_TYPE_GVAWATERMARK3D))
         return FALSE;
+    if (!gst_element_register(plugin, "gvamotiondetect", GST_RANK_NONE, GST_TYPE_GVA_MOTION_DETECT))
+        return FALSE;
 #if _MSC_VER
     if (!gst_element_register(plugin, "gvametapublish", GST_RANK_NONE, GST_TYPE_GVA_META_PUBLISH))
         return FALSE;