diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 4d51f17836..fd03c4a999 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -369,8 +369,12 @@ if(NOT BUILD_CPU_ONLY)
     jit_lto_kernel_usage_requirements INTERFACE rmm::rmm raft::raft CCCL::CCCL cuco::cuco
   )
 
+  enable_language(ASM)
   block(PROPAGATE jit_lto_files)
   set(jit_lto_files)
+  rtcx_jit_lto_embed_begin(
+    cuvs_jit_lto_fragments OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/jit_lto"
+  )
   set(CMAKE_CUDA_ARCHITECTURES ${JIT_LTO_TARGET_ARCHITECTURE})
   set(neighbors_ns "cuvs::neighbors::detail")
   generate_jit_lto_kernels(
@@ -1150,6 +1154,7 @@ if(NOT BUILD_CPU_ONLY)
       "${CMAKE_CURRENT_BINARY_DIR}/generated_kernels/distance/pairwise_matrix/compute_distance_epilog_rbf"
     KERNEL_LINK_LIBRARIES jit_lto_kernel_usage_requirements
   )
+  rtcx_jit_lto_embed_finalize(cuvs_jit_lto_fragments SOURCE_LIST jit_lto_files)
   endblock()
 
   # Note that this matrix contains an `arch_includes` placeholder, since we don't currently have a
diff --git a/cpp/cmake/thirdparty/get_rtcx.cmake b/cpp/cmake/thirdparty/get_rtcx.cmake
index 0c87b5f433..5d52d0cdee 100644
--- a/cpp/cmake/thirdparty/get_rtcx.cmake
+++ b/cpp/cmake/thirdparty/get_rtcx.cmake
@@ -22,8 +22,8 @@ function(find_and_configure_rtcx VERSION)
     BUILD_EXPORT_SET    cuvs-static-exports
     INSTALL_EXPORT_SET  cuvs-static-exports
     CPM_ARGS
-    GIT_REPOSITORY https://github.com/rapidsai/librtcx
-    GIT_TAG a9f63f8cdd4b0b41a2d88a9f705576a61b4222ec
+    GIT_REPOSITORY https://github.com/divyegala/librtcx
+    GIT_TAG cuvs-elf
     GIT_SHALLOW FALSE
   )