diff --git a/lib/Target/TTMetal/TTMetalToFlatbuffer.cpp b/lib/Target/TTMetal/TTMetalToFlatbuffer.cpp
index 0f09ac5bc9..a215c0871f 100644
--- a/lib/Target/TTMetal/TTMetalToFlatbuffer.cpp
+++ b/lib/Target/TTMetal/TTMetalToFlatbuffer.cpp
@@ -83,7 +83,8 @@ ::tt::target::Dim2dRange toFlatbuffer(CoreRangeAttr coreRange) {
 
 ::flatbuffers::Offset<::tt::target::CBDesc>
 cbTypeToFlatbuffer(FlatbufferObjectCache &cache, ttkernel::CBType cbType) {
-  auto memref = cache.getOrCreate(cbType.getMemref(), memrefAttrToFlatbuffer);
+  auto memref = cache.getOrCreate(cbType.getMemref(), memrefAttrToFlatbuffer,
+                                  ::mlir::tt::TensorMemoryLayout::NoneLayout);
   return ::tt::target::CreateCBDesc(
       *cache.fbb,
       static_cast<std::underlying_type_t<ttkernel::CBPort>>(cbType.getPort()),
diff --git a/test/ttmlir/Silicon/TTNN/sharded/simple_eltwise_sharded.mlir b/test/ttmlir/Silicon/TTNN/sharded/simple_eltwise_sharded.mlir
new file mode 100644
index 0000000000..f0a1cbf13c
--- /dev/null
+++ b/test/ttmlir/Silicon/TTNN/sharded/simple_eltwise_sharded.mlir
@@ -0,0 +1,127 @@
+// RUN: ttmlir-opt --ttir-to-ttnn-backend-pipeline="system-desc-path=%system_desc_path%" %s > %t.mlir
+// RUN: FileCheck %s --input-file=%t.mlir
+// RUN: ttmlir-translate --ttnn-to-flatbuffer %t.mlir > %t.ttnn
+#l1_block_sharded = #tt.operand_constraint<l1_block_sharded>
+
+func.func @subtract(%arg0: tensor<1792x256xf32>, %arg1: tensor<1792x256xf32>) -> tensor<1792x256xf32> {
+  // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
+  // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
+  %0 = tensor.empty() : tensor<1792x256xf32>
+  // CHECK: %[[C:.*]] = "ttnn.subtract"[[C:.*]]
+  %1 = "ttir.subtract"(%arg0, %arg1, %0) <{operandSegmentSizes = array<i32: 2, 1>, operand_constraints = [#l1_block_sharded, #l1_block_sharded, #l1_block_sharded]}> : (tensor<1792x256xf32>, tensor<1792x256xf32>, tensor<1792x256xf32>) -> tensor<1792x256xf32>
+  // CHECK: "ttnn.close_device"[[C:.*]]
+  return %1 : tensor<1792x256xf32>
+}
+
+func.func @div(%arg0: tensor<1792x256xf32>, %arg1: tensor<1792x256xf32>) -> tensor<1792x256xf32> {
+  // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
+  // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
+  %0 = tensor.empty() : tensor<1792x256xf32>
+  // CHECK: %[[C:.*]] = "ttnn.div"[[C:.*]]
+  %1 = "ttir.div"(%arg0, %arg1, %0) <{operandSegmentSizes = array<i32: 2, 1>, operand_constraints = [#l1_block_sharded, #l1_block_sharded, #l1_block_sharded]}> : (tensor<1792x256xf32>, tensor<1792x256xf32>, tensor<1792x256xf32>) -> tensor<1792x256xf32>
+  // CHECK: "ttnn.close_device"[[C:.*]]
+  return %1 : tensor<1792x256xf32>
+}
+
+func.func @multiply(%arg0: tensor<1792x256xf32>, %arg1: tensor<1792x256xf32>) -> tensor<1792x256xf32> {
+  // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
+  // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
+  %0 = tensor.empty() : tensor<1792x256xf32>
+  // CHECK: %[[C:.*]] = "ttnn.multiply"[[C:.*]]
+  %1 = "ttir.multiply"(%arg0, %arg1, %0) <{operandSegmentSizes = array<i32: 2, 1>, operand_constraints = [#l1_block_sharded, #l1_block_sharded, #l1_block_sharded]}> : (tensor<1792x256xf32>, tensor<1792x256xf32>, tensor<1792x256xf32>) -> tensor<1792x256xf32>
+  // CHECK: "ttnn.close_device"[[C:.*]]
+  return %1 : tensor<1792x256xf32>
+}
+
+func.func @relu(%arg0: tensor<1792x256xf32>) -> tensor<1792x256xf32> {
+  // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
+  // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
+  %0 = tensor.empty() : tensor<1792x256xf32>
+  // CHECK: %[[C:.*]] = "ttnn.relu"[[C:.*]]
+  %1 = "ttir.relu"(%arg0, %0) <{operandSegmentSizes = array<i32: 1, 1>, operand_constraints = [#l1_block_sharded, #l1_block_sharded]}> : (tensor<1792x256xf32>, tensor<1792x256xf32>) -> tensor<1792x256xf32>
+  // CHECK: "ttnn.close_device"[[C:.*]]
+  return %1 : tensor<1792x256xf32>
+}
+
+func.func @ge(%arg0: tensor<1792x256xf32>, %arg1: tensor<1792x256xf32>) -> tensor<1792x256xf32> {
+  // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
+  // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
+  %0 = tensor.empty() : tensor<1792x256xf32>
+  // CHECK: %[[C:.*]] = "ttnn.ge"[[C:.*]]
+  %1 = "ttir.ge"(%arg0, %arg1, %0) <{operandSegmentSizes = array<i32: 2, 1>, operand_constraints = [#l1_block_sharded, #l1_block_sharded, #l1_block_sharded]}> : (tensor<1792x256xf32>, tensor<1792x256xf32>, tensor<1792x256xf32>) -> tensor<1792x256xf32>
+  // CHECK: "ttnn.close_device"[[C:.*]]
+  return %1 : tensor<1792x256xf32>
+}
+
+func.func @reshape(%arg0: tensor<4x2x1792x256xbf16>) -> tensor<2x4x1792x256xbf16> {
+  %0 = tensor.empty() : tensor<2x4x1792x256xbf16>
+  // CHECK: %[[C:.*]] = "ttnn.reshape"[[C:.*]]
+  %1 = "ttir.reshape"(%arg0, %0) <{shape = [2: i32, 4: i32, 1792: i32, 256: i32] , operand_constraints = [#l1_block_sharded, #l1_block_sharded]}> : (tensor<4x2x1792x256xbf16>, tensor<2x4x1792x256xbf16>) -> tensor<2x4x1792x256xbf16>
+  return %1 : tensor<2x4x1792x256xbf16>
+}
+
+func.func @squeeze(%arg0: tensor<1x2x1x1792x256xbf16>) -> tensor<1x2x1792x256xbf16> {
+  %0 = tensor.empty() : tensor<1x2x1792x256xbf16>
+  // CHECK: %[[C:.*]] = "ttnn.reshape"[[C:.*]]
+  %1 = "ttir.squeeze"(%arg0, %0) <{dim = 2 : si32, operand_constraints = [#l1_block_sharded, #l1_block_sharded]}> : (tensor<1x2x1x1792x256xbf16>, tensor<1x2x1792x256xbf16>) -> tensor<1x2x1792x256xbf16>
+  return %1 : tensor<1x2x1792x256xbf16>
+}
+
+func.func @reciprocal(%arg0: tensor<1792x256xf32>) -> tensor<1792x256xf32> {
+  // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
+  // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
+  %0 = tensor.empty() : tensor<1792x256xf32>
+  // CHECK: %[[C:.*]] = "ttnn.reciprocal"[[C:.*]]
+  %1 = "ttir.reciprocal"(%arg0, %0) <{operandSegmentSizes = array<i32: 1, 1>, operand_constraints = [#l1_block_sharded, #l1_block_sharded]}> : (tensor<1792x256xf32>, tensor<1792x256xf32>) -> tensor<1792x256xf32>
+  // CHECK: "ttnn.close_device"[[C:.*]]
+  return %1 : tensor<1792x256xf32>
+}
+
+func.func @sigmoid(%arg0: tensor<1792x256xf32>) -> tensor<1792x256xf32> {
+  // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
+  // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
+  %0 = tensor.empty() : tensor<1792x256xf32>
+  // CHECK: %[[C:.*]] = "ttnn.sigmoid"[[C:.*]]
+  %1 = "ttir.sigmoid"(%arg0, %0) <{operandSegmentSizes = array<i32: 1, 1>, operand_constraints = [#l1_block_sharded, #l1_block_sharded]}> : (tensor<1792x256xf32>, tensor<1792x256xf32>) -> tensor<1792x256xf32>
+  // CHECK: "ttnn.close_device"[[C:.*]]
+  return %1 : tensor<1792x256xf32>
+}
+
+func.func @sqrt(%arg0: tensor<1792x256xf32>) -> tensor<1792x256xf32> {
+  // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
+  // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
+  %0 = tensor.empty() : tensor<1792x256xf32>
+  // CHECK: %[[C:.*]] = "ttnn.sqrt"[[C:.*]]
+  %1 = "ttir.sqrt"(%arg0, %0) <{operandSegmentSizes = array<i32: 1, 1>, operand_constraints = [#l1_block_sharded, #l1_block_sharded]}> : (tensor<1792x256xf32>, tensor<1792x256xf32>) -> tensor<1792x256xf32>
+  // CHECK: "ttnn.close_device"[[C:.*]]
+  return %1 : tensor<1792x256xf32>
+}
+
+func.func @softmax(%arg0: tensor<1792x256xbf16>) -> tensor<1792x256xbf16> {
+  // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
+  // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
+  %0 = tensor.empty() : tensor<1792x256xbf16>
+  // CHECK: %[[C:.*]] = "ttnn.softmax"[[C:.*]]
+  // Check for positive dimension attribute
+  %1 = "ttir.softmax"(%arg0, %0) <{dimension = 1 : si32, operand_constraints = [#l1_block_sharded, #l1_block_sharded]}> : (tensor<1792x256xbf16>, tensor<1792x256xbf16>) -> tensor<1792x256xbf16>
+  // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
+  %2 = tensor.empty() : tensor<1792x256xbf16>
+  // CHECK: %[[C:.*]] = "ttnn.softmax"[[C:.*]]
+  // Check for negative dimension attribute
+  %3 = "ttir.softmax"(%1, %2) <{dimension = -1 : si32, operand_constraints = [#l1_block_sharded, #l1_block_sharded]}> : (tensor<1792x256xbf16>, tensor<1792x256xbf16>) -> tensor<1792x256xbf16>
+  // CHECK: "ttnn.close_device"[[C:.*]]
+  return %3 : tensor<1792x256xbf16>
+}
+
+// Unsupported eltwise ops with sharding
+
+// Sharded concat requires ROW_MAJOR layout
+// func.func @concat(%arg0: tensor<1792x256xf32>, %arg1: tensor<1792x256xf32>) -> tensor<1792x512xf32> {
+//   // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
+//   // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
+//   %0 = tensor.empty() : tensor<1792x512xf32>
+//   // CHECK: %[[C:.*]] = "ttnn.concat"[[C:.*]]
+//   %1 = "ttir.concat"(%arg0, %arg1, %0) <{dim = 1 : si32, operand_constraints = [#l1_block_sharded, #l1_block_sharded, #l1_block_sharded]}> : (tensor<1792x256xf32>, tensor<1792x256xf32>, tensor<1792x512xf32>) -> tensor<1792x512xf32>
+//   // CHECK: "ttnn.close_device"[[C:.*]]
+//   return %1 : tensor<1792x512xf32>
+// }
diff --git a/test/ttmlir/Silicon/TTNN/sharded/simple_multiply_sharded.mlir b/test/ttmlir/Silicon/TTNN/sharded/simple_multiply_sharded.mlir
deleted file mode 100644
index 38cc0b1e9a..0000000000
--- a/test/ttmlir/Silicon/TTNN/sharded/simple_multiply_sharded.mlir
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: ttmlir-opt --ttir-to-ttnn-backend-pipeline="system-desc-path=%system_desc_path%" %s > %t.mlir
-// RUN: FileCheck %s --input-file=%t.mlir
-// RUN: ttmlir-translate --ttnn-to-flatbuffer %t.mlir > %t.ttnn
-#l1_block_sharded = #tt.operand_constraint<l1_block_sharded>
-module attributes {} {
-  func.func @forward(%arg0: tensor<256x512xbf16>, %arg1: tensor<256x512xbf16>) -> tensor<256x512xbf16> {
-    // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
-    // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
-    %0 = tensor.empty() : tensor<256x512xbf16>
-    // CHECK: %[[C:.*]] = "ttnn.multiply"[[C:.*]]
-    %1 = "ttir.multiply"(%arg0, %arg1, %0) <{operandSegmentSizes = array<i32: 2, 1>, operand_constraints = [#l1_block_sharded, #l1_block_sharded, #l1_block_sharded]}> : (tensor<256x512xbf16>, tensor<256x512xbf16>, tensor<256x512xbf16>) -> tensor<256x512xbf16>
-    // CHECK: "ttnn.close_device"[[C:.*]]
-    return %1 : tensor<256x512xbf16>
-  }
-}
diff --git a/test/ttmlir/Silicon/TTNN/sharded/simple_relu_sharded.mlir b/test/ttmlir/Silicon/TTNN/sharded/simple_relu_sharded.mlir
deleted file mode 100644
index e6dbcb78bf..0000000000
--- a/test/ttmlir/Silicon/TTNN/sharded/simple_relu_sharded.mlir
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: ttmlir-opt --ttir-to-ttnn-backend-pipeline="system-desc-path=%system_desc_path%" %s > %t.mlir
-// RUN: FileCheck %s --input-file=%t.mlir
-// RUN: ttmlir-translate --ttnn-to-flatbuffer %t.mlir > %t.ttnn
-#l1_block_sharded = #tt.operand_constraint<l1_block_sharded>
-module attributes {} {
-  func.func @forward(%arg0: tensor<256x512xf32>) -> tensor<256x512xf32> {
-    // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
-    // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
-    %0 = tensor.empty() : tensor<256x512xf32>
-    // CHECK: %[[C:.*]] = "ttnn.relu"[[C:.*]]
-    %1 = "ttir.relu"(%arg0, %0) <{operandSegmentSizes = array<i32: 1, 1>, operand_constraints = [#l1_block_sharded, #l1_block_sharded]}> : (tensor<256x512xf32>, tensor<256x512xf32>) -> tensor<256x512xf32>
-    // CHECK: "ttnn.close_device"[[C:.*]]
-    return %1 : tensor<256x512xf32>
-  }
-}
diff --git a/test/ttmlir/Silicon/TTNN/sharded/simple_subtract_sharded.mlir b/test/ttmlir/Silicon/TTNN/sharded/simple_subtract_sharded.mlir
deleted file mode 100644
index 8768e5c83f..0000000000
--- a/test/ttmlir/Silicon/TTNN/sharded/simple_subtract_sharded.mlir
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: ttmlir-opt --ttir-to-ttnn-backend-pipeline="system-desc-path=%system_desc_path%" %s > %t.mlir
-// RUN: FileCheck %s --input-file=%t.mlir
-// RUN: ttmlir-translate --ttnn-to-flatbuffer %t.mlir > %t.ttnn
-#l1_block_sharded = #tt.operand_constraint<l1_block_sharded>
-module attributes {} {
-  func.func @forward(%arg0: tensor<256x512xf32>, %arg1: tensor<256x512xf32>) -> tensor<256x512xf32> {
-    // CHECK: %[[C:.*]] = "ttnn.open_device"[[C:.*]]
-    // CHECK: %[[C:.*]] = "ttnn.empty"[[C:.*]]
-    %0 = tensor.empty() : tensor<256x512xf32>
-    // CHECK: %[[C:.*]] = "ttnn.subtract"[[C:.*]]
-    %1 = "ttir.subtract"(%arg0, %arg1, %0) <{operandSegmentSizes = array<i32: 2, 1>, operand_constraints = [#l1_block_sharded, #l1_block_sharded, #l1_block_sharded]}> : (tensor<256x512xf32>, tensor<256x512xf32>, tensor<256x512xf32>) -> tensor<256x512xf32>
-    // CHECK: "ttnn.close_device"[[C:.*]]
-    return %1 : tensor<256x512xf32>
-  }
-}