diff --git a/lib/OpModel/TTNN/CMakeLists.txt b/lib/OpModel/TTNN/CMakeLists.txt
index 1210c7ebf9..f837dad219 100644
--- a/lib/OpModel/TTNN/CMakeLists.txt
+++ b/lib/OpModel/TTNN/CMakeLists.txt
@@ -22,7 +22,11 @@ if (TTMLIR_ENABLE_OPMODEL)
 
     # Link to tt-metal libs and include directories
     target_include_directories(${LIB_NAME} PUBLIC "$<BUILD_INTERFACE:${TTMETAL_INCLUDE_DIRS}>")
-    target_link_libraries(${LIB_NAME} PUBLIC TTNN_LIBRARY TTMETAL_LIBRARY DEVICE_LIBRARY)
+    set(TTNN_LIBS TTMETAL_LIBRARY DEVICE_LIBRARY TTNN_LIBRARY)
+    if (TT_RUNTIME_ENABLE_PERF_TRACE)
+        list(APPEND TTNN_LIBS TRACY_LIBRARY)
+    endif()
+    target_link_libraries(${LIB_NAME} PUBLIC ${TTNN_LIBS})
     target_compile_definitions(${LIB_NAME} PUBLIC TTMLIR_ENABLE_OPMODEL)
 else()
     # link stubs implementation when op model library is disabled
diff --git a/runtime/lib/ttmetal/CMakeLists.txt b/runtime/lib/ttmetal/CMakeLists.txt
index f31fad2530..a708ebfb09 100644
--- a/runtime/lib/ttmetal/CMakeLists.txt
+++ b/runtime/lib/ttmetal/CMakeLists.txt
@@ -12,5 +12,3 @@ target_include_directories(TTRuntimeTTMetal PUBLIC
 target_include_directories(TTRuntimeTTMetal SYSTEM PUBLIC "$<BUILD_INTERFACE:${TTMETAL_INCLUDE_DIRS}>")
 target_link_libraries(TTRuntimeTTMetal PUBLIC TTMETAL_LIBRARY DEVICE_LIBRARY)
 add_dependencies(TTRuntimeTTMetal TTMETAL_LIBRARY DEVICE_LIBRARY tt-metal FBS_GENERATION)
-
-# Optionally compile profiling code and link tracy client for perf profiling.
diff --git a/test/unittests/OpModel/TTNN/Conversion/CMakeLists.txt b/test/unittests/OpModel/TTNN/Conversion/CMakeLists.txt
index 75ea0c18a3..b40ea92090 100644
--- a/test/unittests/OpModel/TTNN/Conversion/CMakeLists.txt
+++ b/test/unittests/OpModel/TTNN/Conversion/CMakeLists.txt
@@ -9,7 +9,6 @@ add_executable(TestConversion
 
 target_compile_options(TestConversion
     PRIVATE
-    -fno-rtti
 )
 
 target_include_directories(TestConversion
diff --git a/test/unittests/OpModel/TTNN/Lib/CMakeLists.txt b/test/unittests/OpModel/TTNN/Lib/CMakeLists.txt
index 04e351da09..368d153b1b 100644
--- a/test/unittests/OpModel/TTNN/Lib/CMakeLists.txt
+++ b/test/unittests/OpModel/TTNN/Lib/CMakeLists.txt
@@ -8,7 +8,6 @@ TestOpModelLib.cpp
 
 target_compile_options(TestOpModelLib
     PRIVATE
-    -fno-rtti
 )
 
 target_include_directories(TestOpModelLib
diff --git a/test/unittests/OpModel/TTNN/Op/CMakeLists.txt b/test/unittests/OpModel/TTNN/Op/CMakeLists.txt
index 5ce1c9ec17..d5d23935af 100644
--- a/test/unittests/OpModel/TTNN/Op/CMakeLists.txt
+++ b/test/unittests/OpModel/TTNN/Op/CMakeLists.txt
@@ -8,7 +8,6 @@ TestOpModelInterface.cpp
 
 target_compile_options(TestOpModelInterface
     PRIVATE
-    -fno-rtti
 )
 
 target_include_directories(TestOpModelInterface
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 794038e720..cc80f12ebe 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(ExternalProject)
 
-set(TT_METAL_VERSION "9b3d8557734bba9b5c7e91e178b85e4e019022cf")
+set(TT_METAL_VERSION "f05457a1eb5b45fddbd60b35835439994e06ae9d")
 
 set(CMAKE_INSTALL_MESSAGE LAZY)  # suppress "Up-to-date:..." messages in incremental builds
 
diff --git a/tools/ttnn-standalone/CMakeLists.txt b/tools/ttnn-standalone/CMakeLists.txt
index ef72f98da8..21cd87f1ff 100644
--- a/tools/ttnn-standalone/CMakeLists.txt
+++ b/tools/ttnn-standalone/CMakeLists.txt
@@ -65,6 +65,7 @@ set(INCLUDE_DIRS
 
     # Metalium
     $ENV{TT_METAL_HOME}
+    $ENV{TT_METAL_HOME}/tt_metal
     $ENV{TT_METAL_HOME}/tt_metal/api
     $ENV{TT_METAL_HOME}/tt_metal/hostdevcommon/api
     $ENV{TT_METAL_HOME}/tt_metal/hw/inc