diff --git a/.github/workflows/fluentd.yml b/.github/workflows/fluentd.yml
index 0aea2aa45..804c733d5 100644
--- a/.github/workflows/fluentd.yml
+++ b/.github/workflows/fluentd.yml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.19.0"
+          ref: "v1.21.0"
           path: "opentelemetry-cpp"
           submodules: "recursive"
       - name: setup dependencies
diff --git a/.github/workflows/geneva_metrics.yml b/.github/workflows/geneva_metrics.yml
index c39ec32de..de4bb2db2 100644
--- a/.github/workflows/geneva_metrics.yml
+++ b/.github/workflows/geneva_metrics.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.20.0"
+          ref: "v1.21.0"
           path: "otel_cpp"
           submodules: "recursive"
       - name: setup
diff --git a/.github/workflows/user_events.yml b/.github/workflows/user_events.yml
index 816f24ca5..2e95a7363 100644
--- a/.github/workflows/user_events.yml
+++ b/.github/workflows/user_events.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.20.0"
+          ref: "v1.21.0"
           path: "opentelemetry-cpp"
           submodules: "recursive"
       - name: setup dependencies
diff --git a/exporters/fluentd/CMakeLists.txt b/exporters/fluentd/CMakeLists.txt
index 919ba189a..ada242cc6 100644
--- a/exporters/fluentd/CMakeLists.txt
+++ b/exporters/fluentd/CMakeLists.txt
@@ -117,19 +117,42 @@ if (WITH_EXAMPLES)
 endif()
 
 if(OPENTELEMETRY_INSTALL)
-  install(
-    TARGETS opentelemetry_exporter_geneva_logs
-            opentelemetry_exporter_geneva_trace
-    EXPORT "${PROJECT_NAME}-target"
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-  install(
-    DIRECTORY include/opentelemetry/exporters/
-    DESTINATION include/opentelemetry/exporters/
-    FILES_MATCHING
-    PATTERN "*.h")
+  if(MAIN_PROJECT)
+    install(
+      TARGETS opentelemetry_exporter_geneva_logs
+              opentelemetry_exporter_geneva_trace
+      EXPORT "${PROJECT_NAME}-target"
+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+    install(
+      DIRECTORY include/opentelemetry/exporters/
+      DESTINATION include/opentelemetry/exporters/
+      FILES_MATCHING
+      PATTERN "*.h")
+  else()
+    set_target_properties(
+      opentelemetry_exporter_geneva_trace
+      PROPERTIES
+        EXPORT_NAME opentelemetry_exporter_geneva_trace)
+    set_target_properties(
+      opentelemetry_exporter_geneva_logs
+      PROPERTIES
+        EXPORT_NAME opentelemetry_exporter_geneva_logs)
+    otel_add_component(
+      COMPONENT
+      exporters_geneva_fluentd
+      TARGETS
+      opentelemetry_exporter_geneva_logs
+      opentelemetry_exporter_geneva_trace
+      FILES_DIRECTORY
+      "include/opentelemetry/exporters/"
+      FILES_DESTINATION
+      "include/opentelemetry/exporters"
+      FILES_MATCHING
+      PATTERN "*.h")
+  endif()
 endif()
 
 if(BUILD_TESTING)
diff --git a/exporters/geneva-trace/CMakeLists.txt b/exporters/geneva-trace/CMakeLists.txt
index 3196bb611..167822d07 100644
--- a/exporters/geneva-trace/CMakeLists.txt
+++ b/exporters/geneva-trace/CMakeLists.txt
@@ -30,16 +30,39 @@ if(WITH_EXAMPLES)
 endif()
 
 if(OPENTELEMETRY_INSTALL)
-  install(DIRECTORY include/ DESTINATION include)
+  if(MAIN_PROJECT)
+    install(DIRECTORY include/ DESTINATION include)
 
-  install(
-    TARGETS opentelemetry_exporter_geneva_trace opentelemetry_exporter_geneva_logs
-    EXPORT "${PROJECT_NAME}-target")
-
-  if(NOT MAIN_PROJECT)
     install(
-      EXPORT "${PROJECT_NAME}-target"
-      NAMESPACE "${PROJECT_NAME}::"
-      DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+      TARGETS opentelemetry_exporter_geneva_trace opentelemetry_exporter_geneva_logs
+      EXPORT "${PROJECT_NAME}-target")
+
+    if(NOT MAIN_PROJECT)
+      install(
+        EXPORT "${PROJECT_NAME}-target"
+        NAMESPACE "${PROJECT_NAME}::"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+    endif()
+  else()
+    set_target_properties(
+      opentelemetry_exporter_geneva_trace
+      PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_trace)
+    set_target_properties(
+      opentelemetry_exporter_geneva_logs
+      PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_logs)
+
+    otel_add_component(
+      COMPONENT
+      exporters_geneva_trace_logs
+      TARGETS
+      opentelemetry_exporter_geneva_trace
+      opentelemetry_exporter_geneva_logs
+      FILES_DIRECTORY
+      "include/opentelemetry/exporters/geneva"
+      FILES_DESTINATION
+      "include/opentelemetry/exporters/geneva"
+      FILES_MATCHING
+      PATTERN
+      "*.h")
   endif()
 endif()
\ No newline at end of file
diff --git a/exporters/geneva-trace/third_party/opentelemetry-cpp b/exporters/geneva-trace/third_party/opentelemetry-cpp
index 6175aa0b2..b9cf499ff 160000
--- a/exporters/geneva-trace/third_party/opentelemetry-cpp
+++ b/exporters/geneva-trace/third_party/opentelemetry-cpp
@@ -1 +1 @@
-Subproject commit 6175aa0b213eea053247e43b4f35b8d201fa356e
+Subproject commit b9cf499ff5715433848b316059714b5c59af1f2c
diff --git a/exporters/geneva/CMakeLists.txt b/exporters/geneva/CMakeLists.txt
index 2bca758e3..10548706a 100644
--- a/exporters/geneva/CMakeLists.txt
+++ b/exporters/geneva/CMakeLists.txt
@@ -91,6 +91,9 @@ if(BUILD_TESTING)
 endif()
 
 if(OPENTELEMETRY_INSTALL)
+
+if(MAIN_PROJECT)
+
   install(
     TARGETS opentelemetry_exporter_geneva_metrics
     EXPORT "${PROJECT_NAME}-target"
@@ -103,6 +106,25 @@ if(OPENTELEMETRY_INSTALL)
     DESTINATION include/opentelemetry/exporters
     FILES_MATCHING
     PATTERN "*.h")
+
+else()
+
+  set_target_properties(opentelemetry_exporter_geneva_metrics PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_metrics)
+
+  otel_add_component(
+    COMPONENT
+    exporters_geneva_metrics
+    TARGETS
+    opentelemetry_exporter_geneva_metrics
+    FILES_DIRECTORY
+    "include/opentelemetry/exporters/geneva"
+    FILES_DESTINATION
+    "include/opentelemetry/exporters"
+    FILES_MATCHING
+    PATTERN
+    "*.h")
+
+endif()
 endif()
 
 if(WITH_EXAMPLES)
diff --git a/exporters/user_events/CMakeLists.txt b/exporters/user_events/CMakeLists.txt
index 9d553c3a3..b2576f714 100644
--- a/exporters/user_events/CMakeLists.txt
+++ b/exporters/user_events/CMakeLists.txt
@@ -136,6 +136,8 @@ if(WITH_BENCHMARK)
     opentelemetry_exporter_user_events_logs)
 endif()
 
+if(MAIN_PROJECT)
+
 install(
   TARGETS opentelemetry_exporter_user_events_logs
   EXPORT "${PROJECT_NAME}-target"
@@ -148,3 +150,26 @@ install(
   DESTINATION include/opentelemetry/exporters
   FILES_MATCHING
   PATTERN "*.h")
+else()
+  set_target_properties(
+    opentelemetry_exporter_user_events_logs
+    PROPERTIES
+      EXPORT_NAME opentelemetry_exporter_user_events_logs)
+  set_target_properties(
+    opentelemetry_exporter_user_events_metrics
+    PROPERTIES
+      EXPORT_NAME opentelemetry_exporter_user_events_metrics)
+  otel_add_component(
+    COMPONENT
+    exporters_user_events
+    TARGETS
+    opentelemetry_exporter_user_events_logs
+    opentelemetry_exporter_user_events_metrics
+    FILES_DIRECTORY
+    "include/opentelemetry/exporters/user_events"
+    FILES_DESTINATION
+    "include/opentelemetry/exporters"
+    FILES_MATCHING
+    PATTERN
+    "*.h")
+endif()
\ No newline at end of file