diff --git a/library/src/tensor_operation_instance/gpu/CMakeLists.txt b/library/src/tensor_operation_instance/gpu/CMakeLists.txt
index dfd73ab77b..230ff5362c 100644
--- a/library/src/tensor_operation_instance/gpu/CMakeLists.txt
+++ b/library/src/tensor_operation_instance/gpu/CMakeLists.txt
@@ -6,64 +6,19 @@ function(add_instance_library INSTANCE_NAME)
     clang_tidy_check(${INSTANCE_NAME})
 endfunction(add_instance_library INSTANCE_NAME)
 
-add_subdirectory(gemm)
-add_subdirectory(gemm_splitk)
-add_subdirectory(gemm_bilinear)
-add_subdirectory(gemm_add_add_fastgelu)
-add_subdirectory(gemm_reduce)
-add_subdirectory(gemm_bias_add_reduce)
-add_subdirectory(batched_gemm)
-add_subdirectory(batched_gemm_reduce)
-add_subdirectory(batched_gemm_gemm)
-add_subdirectory(batched_gemm_softmax_gemm)
-add_subdirectory(batched_gemm_masking_scale_softmax_gemm_permute)
-add_subdirectory(batched_gemm_add_relu_gemm_add)
-add_subdirectory(grouped_gemm)
-add_subdirectory(contraction_scale)
-add_subdirectory(contraction_bilinear)
-add_subdirectory(grouped_conv1d_fwd)
-add_subdirectory(grouped_conv2d_fwd)
-add_subdirectory(grouped_conv3d_fwd)
-add_subdirectory(conv2d_fwd)
-add_subdirectory(conv1d_bwd_data)
-add_subdirectory(conv2d_bwd_data)
-add_subdirectory(conv3d_bwd_data)
-add_subdirectory(conv1d_bwd_weight)
-add_subdirectory(conv2d_bwd_weight)
-add_subdirectory(conv3d_bwd_weight)
-add_subdirectory(conv2d_fwd_bias_relu)
-add_subdirectory(conv2d_fwd_bias_relu_add)
-add_subdirectory(reduce)
-add_subdirectory(normalization)
-add_subdirectory(elementwise)
+file(GLOB dir_list LIST_DIRECTORIES true *)
+set(CK_DEVICE_INSTANCES)
+FOREACH(subdir_path ${dir_list})
+set(target_dir)
+IF(IS_DIRECTORY "${subdir_path}")
+    get_filename_component(target_dir ${subdir_path} NAME)
+    add_subdirectory(${target_dir})
+    list(APPEND CK_DEVICE_INSTANCES $<TARGET_OBJECTS:device_${target_dir}_instance>)
+ENDIF()
+ENDFOREACH()
 
-add_library(device_operations STATIC
-    $<TARGET_OBJECTS:device_gemm_instance>
-    $<TARGET_OBJECTS:device_gemm_splitk_instance>
-    $<TARGET_OBJECTS:device_gemm_bilinear_instance>
-    $<TARGET_OBJECTS:device_gemm_add_add_fastgelu_instance>
-    $<TARGET_OBJECTS:device_gemm_bias_add_reduce_instance>
-    $<TARGET_OBJECTS:device_batched_gemm_instance>
-    $<TARGET_OBJECTS:device_batched_gemm_add_relu_gemm_add_instance>
-    $<TARGET_OBJECTS:device_batched_gemm_reduce_instance>
-    $<TARGET_OBJECTS:device_grouped_gemm_instance>
-    $<TARGET_OBJECTS:device_contraction_scale_instance>
-    $<TARGET_OBJECTS:device_contraction_bilinear_instance>
-    $<TARGET_OBJECTS:device_grouped_conv1d_fwd_instance>
-    $<TARGET_OBJECTS:device_grouped_conv2d_fwd_instance>
-    $<TARGET_OBJECTS:device_grouped_conv3d_fwd_instance>
-    $<TARGET_OBJECTS:device_conv1d_bwd_data_instance>
-    $<TARGET_OBJECTS:device_conv2d_bwd_data_instance>
-    $<TARGET_OBJECTS:device_conv3d_bwd_data_instance>
-    $<TARGET_OBJECTS:device_conv1d_bwd_weight_instance>
-    $<TARGET_OBJECTS:device_conv2d_bwd_weight_instance>
-    $<TARGET_OBJECTS:device_conv3d_bwd_weight_instance>
-    $<TARGET_OBJECTS:device_conv2d_fwd_bias_relu_instance>
-    $<TARGET_OBJECTS:device_conv2d_fwd_bias_relu_add_instance>
-    $<TARGET_OBJECTS:device_reduce_instance>
-    $<TARGET_OBJECTS:device_normalization_instance>
-    $<TARGET_OBJECTS:device_elementwise_instance>
-)
+
+add_library(device_operations STATIC ${CK_DEVICE_INSTANCES})
 add_library(composablekernels::device_operations ALIAS device_operations)
 
 
diff --git a/requirements.txt b/requirements.txt
index b91bf2e553..8b13789179 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-danmar/cppcheck@dd05839a7e63ef04afd34711cb3e1e0ef742882f
+