diff --git a/radio/fhi_72/mplane/ru-mplane-api.c b/radio/fhi_72/mplane/ru-mplane-api.c
index 508ed2a393..972a286d9b 100644
--- a/radio/fhi_72/mplane/ru-mplane-api.c
+++ b/radio/fhi_72/mplane/ru-mplane-api.c
@@ -98,6 +98,10 @@ bool get_config_for_xran(const char *buffer, const int max_num_ant, xran_mplane_
   xran_mplane->frame_str = (int16_t)atoi((char *)match_list[0]);
   free_match_list(match_list, count);
 
+  // Managed delay support
+  const char *managed_delay = get_ru_xml_node(buffer, "managed-delay-support");
+  xran_mplane->managed_delay = (strcasecmp(managed_delay, "NON_MANAGED") == 0) ? false : true;
+
   if (strcasecmp(ru_vendor, "BENETEL") == 0 /* || strcmp(ru_vendor, "VVDN-LPRU") == 0 || strcmp(ru_vendor, "Metanoia") == 0 */) {
     fix_benetel_setting(xran_mplane, interface_mtu, first_iq_width, max_num_ant);
   } else {
diff --git a/radio/fhi_72/mplane/ru-mplane-api.h b/radio/fhi_72/mplane/ru-mplane-api.h
index a51e500c96..4888c51608 100644
--- a/radio/fhi_72/mplane/ru-mplane-api.h
+++ b/radio/fhi_72/mplane/ru-mplane-api.h
@@ -58,6 +58,7 @@ typedef struct {
   uint8_t ccid;
   uint8_t ru_port;
   int16_t frame_str; // might be needed in the future xran releases
+  bool managed_delay;
 
 } xran_mplane_t;
 
diff --git a/radio/fhi_72/mplane/yang/create-yang-config.c b/radio/fhi_72/mplane/yang/create-yang-config.c
index 58be178801..6742dc452d 100644
--- a/radio/fhi_72/mplane/yang/create-yang-config.c
+++ b/radio/fhi_72/mplane/yang/create-yang-config.c
@@ -197,6 +197,10 @@ static bool fill_uplane_ch_rx_v2(const xran_mplane_t *xran_mplane, const openair
   ret = fill_uplane_ch_common_v2(UP_CH_RX, xran_mplane, oai, idx, root);
   VERIFY_SUCCESS(ret == LY_SUCCESS, "[MPLANE] Failed to create common nodes.\n");
 
+  const char *managed_delay = xran_mplane->managed_delay ? "true" : "false";
+  ret = lyd_new_term(*root, NULL, "non-time-managed-delay-enabled", managed_delay, 0, NULL);
+  VERIFY_SUCCESS(ret == LY_SUCCESS, "[MPLANE] Failed to create \"non-time-managed-delay-enabled\" node.\n");
+
   struct lyd_node *fft_offset = NULL;
   ret = lyd_new_list(*root, NULL, "ul-fft-sampling-offsets", 0, &fft_offset, scs_name[oai->nr_scs_for_raster]);
   VERIFY_SUCCESS(ret == LY_SUCCESS, "[MPLANE] Failed to create \"ul-fft-sampling-offsets\" node.\n");