diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index d47ebe7ff7b..83c99e7c8f1 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -5914,6 +5914,7 @@ filegroup(
         "lookup_table_op.h",
         "lookup_util.h",
         "list_kernels.h",
+        "map_kernels.h",
         "maxpooling_op.h",
         "mfcc.h",
         "mfcc_dct.h",
@@ -5949,6 +5950,7 @@ filegroup(
         "string_to_hash_bucket_fast_op.h",
         "tensor_array.h",
         "tensor_list.h",
+        "tensor_map.h",
         "tile_functor.h",
         "tile_ops_impl.h",
         "topk_op.h",
@@ -6139,6 +6141,7 @@ filegroup(
         "lookup_table_op.cc",
         "lookup_util.cc",
         "lrn_op.cc",
+        "map_kernels.cc",
         "maxpooling_op.cc",
         "mfcc.cc",
         "mfcc_dct.cc",
@@ -6225,6 +6228,7 @@ filegroup(
         "tensor_array.cc",
         "tensor_array_ops.cc",
         "tensor_list.cc",
+        "tensor_map.cc",
         "tile_functor_cpu.h",
         "tile_functor_cpu_bfloat16.cc",
         "tile_functor_cpu_bool.cc",
diff --git a/tensorflow/lite/delegates/flex/allowlisted_flex_ops.cc b/tensorflow/lite/delegates/flex/allowlisted_flex_ops.cc
index 0ab59bce8c8..157b1488987 100644
--- a/tensorflow/lite/delegates/flex/allowlisted_flex_ops.cc
+++ b/tensorflow/lite/delegates/flex/allowlisted_flex_ops.cc
@@ -166,6 +166,7 @@ const std::set<std::string>& GetFlexAllowlist() {
           "EluGrad",
           "Empty",
           "EmptyTensorList",
+          "EmptyTensorMap",
           "EncodeBase64",
           "EncodeJpeg",
           "EncodeJpegVariableQuality",
@@ -621,6 +622,12 @@ const std::set<std::string>& GetFlexAllowlist() {
           "TensorListSetItem",
           "TensorListSplit",
           "TensorListStack",
+          "TensorMapErase",
+          "TensorMapHasKey",
+          "TensorMapInsert",
+          "TensorMapLookup",
+          "TensorMapSize",
+          "TensorMapStackKeys",
           "TensorScatterAdd",
           "TensorScatterMax",
           "TensorScatterMin",