diff --git a/src/monolithic/gst/elements/gvagenai/CMakeLists.txt b/src/monolithic/gst/elements/gvagenai/CMakeLists.txt
index 8effbe2f..2975a646 100644
--- a/src/monolithic/gst/elements/gvagenai/CMakeLists.txt
+++ b/src/monolithic/gst/elements/gvagenai/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ==============================================================================
-# Copyright (C) 2025 Intel Corporation
+# Copyright (C) 2026 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 # ==============================================================================
@@ -15,7 +15,7 @@ find_package(OpenVINOGenAI REQUIRED)
 find_package(OpenCV REQUIRED)
 
 # Add executable
-add_library(${TARGET_NAME} SHARED
+add_library(${TARGET_NAME} STATIC
     gstgvagenai.cpp
     genai.cpp
     configs.cpp
diff --git a/src/monolithic/gst/elements/gvagenai/gstgvagenai.cpp b/src/monolithic/gst/elements/gvagenai/gstgvagenai.cpp
index c57e3545..6c581465 100644
--- a/src/monolithic/gst/elements/gvagenai/gstgvagenai.cpp
+++ b/src/monolithic/gst/elements/gvagenai/gstgvagenai.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2025 Intel Corporation
+ * Copyright (C) 2026 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  ******************************************************************************/
@@ -447,11 +447,3 @@ static gboolean gst_gvagenai_set_caps(GstBaseTransform *base, GstCaps *incaps, G
 
     return TRUE;
 }
-
-static gboolean plugin_init(GstPlugin *plugin) {
-    gst_element_register(plugin, "gvagenai", GST_RANK_NONE, GST_TYPE_GVAGENAI);
-    return TRUE;
-}
-
-GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, gvagenai, PRODUCT_FULL_NAME " GenAI elements", 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 ffdf45e7..00cf069f 100644
--- a/src/monolithic/gst/registrator/CMakeLists.txt
+++ b/src/monolithic/gst/registrator/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ==============================================================================
-# Copyright (C) 2018-2025 Intel Corporation
+# Copyright (C) 2018-2026 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 # ==============================================================================
@@ -25,6 +25,7 @@ target_include_directories(${TARGET_NAME}
 PRIVATE
     ${GSTREAMER_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvagenai/
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvametaaggregate/
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvametaconvert/
     ${CMAKE_CURRENT_SOURCE_DIR}/../elements/gvametapublish/
@@ -48,4 +49,8 @@ PRIVATE
     gvametapublish
 )
 
+if(ENABLE_GENAI)
+    target_link_libraries(${TARGET_NAME} PRIVATE gvagenai)
+endif()
+
 install(TARGETS ${TARGET_NAME} DESTINATION ${DLSTREAMER_PLUGINS_INSTALL_PATH})
diff --git a/src/monolithic/gst/registrator/register_elements.cpp b/src/monolithic/gst/registrator/register_elements.cpp
index cabe7301..e30115a6 100644
--- a/src/monolithic/gst/registrator/register_elements.cpp
+++ b/src/monolithic/gst/registrator/register_elements.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2018-2025 Intel Corporation
+ * Copyright (C) 2018-2026 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  ******************************************************************************/
@@ -11,6 +11,7 @@
 #include "gstgvaaudiodetect.h"
 #ifdef ENABLE_GENAI
 #include "gstgvaaudiotranscribe.h"
+#include "gstgvagenai.h"
 #endif
 #include "gstgvaclassify.h"
 #include "gstgvadetect.h"
@@ -47,6 +48,8 @@ static gboolean plugin_init(GstPlugin *plugin) {
 #ifdef ENABLE_GENAI
     if (!gst_element_register(plugin, "gvaaudiotranscribe", GST_RANK_NONE, gst_gva_audio_transcribe_get_type()))
         return FALSE;
+    if (!gst_element_register(plugin, "gvagenai", GST_RANK_NONE, GST_TYPE_GVAGENAI))
+        return FALSE;
 #endif
     if (!gst_element_register(plugin, "gvatrack", GST_RANK_NONE, GST_TYPE_GVA_TRACK))
         return FALSE;