diff --git a/cmake/sparrow_vmvx_module.cmake b/cmake/sparrow_vmvx_module.cmake
index ccfe878..c4ab6cb 100644
--- a/cmake/sparrow_vmvx_module.cmake
+++ b/cmake/sparrow_vmvx_module.cmake
@@ -93,8 +93,11 @@
     list(APPEND _COMPILER_ARGS "--iree-hal-target-backends=vmvx-inline")
   else()
     list(APPEND _COMPILER_ARGS "--iree-hal-target-backends=vmvx")
-    list(APPEND _COMPILER_ARGS "--iree-vmvx-enable-microkernels")
-    list(APPEND _COMPILER_ARGS "--iree-opt-data-tiling")
+    if (NOT _RULE_EMITC)
+      # TODO(b/307961190): Only enable ukernel for bytecode path for now
+      list(APPEND _COMPILER_ARGS "--iree-vmvx-enable-microkernels")
+      list(APPEND _COMPILER_ARGS "--iree-opt-data-tiling")
+    endif()
   endif()
 
   if(_RULE_EMITC)
diff --git a/samples/microbenchmarks/CMakeLists.txt b/samples/microbenchmarks/CMakeLists.txt
index e8580bf..6dcc43f 100644
--- a/samples/microbenchmarks/CMakeLists.txt
+++ b/samples/microbenchmarks/CMakeLists.txt
@@ -51,8 +51,7 @@
 )
 
 # Do not compile following models for Kelvin
-# TODO(b/304339109): Temporarily disable the following target until LLVM issue is resolved
-if (true)
+if (${BUILD_WITH_KELVIN})
   return()
 endif()