diff --git a/executables/nr-ru.c b/executables/nr-ru.c
index f11366f0ba..20deff5725 100644
--- a/executables/nr-ru.c
+++ b/executables/nr-ru.c
@@ -878,7 +878,7 @@ static void fill_rf_config(RU_t *ru, char *rf_config_file)
   }
 }
 
-static void fill_split7_2_config(split7_config_t *split7, const nfapi_nr_config_request_scf_t *config, int slots_per_frame, uint16_t ofdm_symbol_size)
+static void fill_split7_2_config(split7_config_t *split7, const nfapi_nr_config_request_scf_t *config, const NR_DL_FRAME_PARMS *fp)
 {
   const nfapi_nr_prach_config_t *prach_config = &config->prach_config;
   const nfapi_nr_tdd_table_t *tdd_table = &config->tdd_table;
@@ -894,7 +894,7 @@ static void fill_split7_2_config(split7_config_t *split7, const nfapi_nr_config_
   if (cell_config->frame_duplex_type.value == 1 /* TDD */) {
     DevAssert(tdd_table->tdd_period.tl.tag == NFAPI_NR_CONFIG_TDD_PERIOD_TAG);
     int nb_periods_per_frame = get_nb_periods_per_frame(tdd_table->tdd_period.value);
-    split7->n_tdd_period = slots_per_frame / nb_periods_per_frame;
+    split7->n_tdd_period = fp->slots_per_frame / nb_periods_per_frame;
     for (int slot = 0; slot < split7->n_tdd_period; ++slot) {
       for (int sym = 0; sym < 14; ++sym) {
         split7->slot_dirs[slot].sym_dir[sym] = tdd_table->max_tdd_periodicity_list[slot].max_num_of_symbol_per_slot_list[sym].slot_config.value;
@@ -902,13 +902,15 @@ static void fill_split7_2_config(split7_config_t *split7, const nfapi_nr_config_
     }
   }
 
-  split7->fftSize = log2(ofdm_symbol_size);
+  split7->fftSize = log2(fp->ofdm_symbol_size);
 
   // M-plane related parameters
   for (size_t i = 0; i < 5 ; i++) {
     split7->dl_k0[i] = carrier_config->dl_k0[i].value;
     split7->ul_k0[i] = carrier_config->ul_k0[i].value;
   }
+  split7->cp_prefix0 = fp->nb_prefix_samples0;
+  split7->cp_prefix_other = fp->nb_prefix_samples;
 }
 
 /* this function maps the RU tx and rx buffers to the available rf chains.
@@ -1051,7 +1053,7 @@ void *ru_thread(void *param)
   nr_dump_frame_parms(fp);
   nr_phy_init_RU(ru);
   fill_rf_config(ru, ru->rf_config_file);
-  fill_split7_2_config(&ru->openair0_cfg.split7, &ru->config, fp->slots_per_frame, fp->ofdm_symbol_size);
+  fill_split7_2_config(&ru->openair0_cfg.split7, &ru->config, fp);
 
   // Start IF device if any
   if (ru->nr_start_if) {
diff --git a/radio/COMMON/common_lib.h b/radio/COMMON/common_lib.h
index d8465e3758..b87a6a8abf 100644
--- a/radio/COMMON/common_lib.h
+++ b/radio/COMMON/common_lib.h
@@ -202,6 +202,9 @@ typedef struct split7_config {
   // M-plane related parameters
   uint16_t dl_k0[5];
   uint16_t ul_k0[5];
+  uint16_t cp_prefix0;
+  uint16_t cp_prefix_other;
+
 } split7_config_t;
 
 /*! \brief RF frontend parameters set by application */
diff --git a/radio/fhi_72/mplane/yang/create-yang-config.c b/radio/fhi_72/mplane/yang/create-yang-config.c
index e6cf25c626..58be178801 100644
--- a/radio/fhi_72/mplane/yang/create-yang-config.c
+++ b/radio/fhi_72/mplane/yang/create-yang-config.c
@@ -116,10 +116,20 @@ static LY_ERR fill_uplane_ch_common_v2(const uplane_dir_t dir, const xran_mplane
   ret = lyd_new_term(*root, NULL, "frame-structure", frame_str, 0, NULL);
   VERIFY_SUCCESS(ret == LY_SUCCESS, "[MPLANE] Failed to create \"frame-structure\" node.\n");
 
-  ret = lyd_new_term(*root, NULL, "cp-length", "0", 0, NULL);
+  // EXTENDED not supported
+  // 3GPP TS 38.211
+  const char cp_type[] = "NORMAL";
+  ret = lyd_new_term(*root, NULL, "cp-type", cp_type, 0, NULL);
+  VERIFY_SUCCESS(ret == LY_SUCCESS, "[MPLANE] Failed to create \"cp-type\" node.\n");
+
+  char cp_len[8];
+  snprintf(cp_len, sizeof(cp_len), "%d", oai->split7.cp_prefix0);
+  ret = lyd_new_term(*root, NULL, "cp-length", cp_len, 0, NULL);
   VERIFY_SUCCESS(ret == LY_SUCCESS, "[MPLANE] Failed to create \"cp-length\" node.\n");
 
-  ret = lyd_new_term(*root, NULL, "cp-length-other", "0", 0, NULL);
+  char cp_len_other[8];
+  snprintf(cp_len_other, sizeof(cp_len_other), "%d", oai->split7.cp_prefix_other);
+  ret = lyd_new_term(*root, NULL, "cp-length-other", cp_len_other, 0, NULL);
   VERIFY_SUCCESS(ret == LY_SUCCESS, "[MPLANE] Failed to create \"cp-length-other\" node.\n");
 
   char freq_offset[8];