diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.fr2.128PRB.prs.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.fr2.128PRB.prs.usrpx310.conf
index 1aa33fb52c..10f77dcef5 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.fr2.128PRB.prs.usrpx310.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.fr2.128PRB.prs.usrpx310.conf
@@ -216,18 +216,21 @@ MACRLCs = (
 
 prs_config = (
 {
-  PRSResourceSetPeriod0 = 40;
-  PRSResourceSetPeriod1 = 0;
-  SymbolStart = 7;
-  NumPRSSymbols = 7;
+  NumPRSResources = 1;
+  PRSResourceSetPeriod = [40, 0];
+  SymbolStart = [7];
+  NumPRSSymbols = [7];
   NumRB = 128;
   RBOffset = 0;
   CombSize = 4;
-  REOffset = 0;
-  PRSResourceOffset = 0;
+  REOffset = [0];
+  PRSResourceOffset = [0];
   PRSResourceRepetition = 1;
   PRSResourceTimeGap = 1;
-  NPRS_ID = 0;
+  NPRS_ID = [0];
+  MutingPattern1 = [];
+  MutingPattern2 = [];
+  MutingBitRepetition = 1;
 }
 );
 
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.fr2.64PRB.prs.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.fr2.64PRB.prs.usrpx310.conf
index 9f00f6b787..56bbc23ef0 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.fr2.64PRB.prs.usrpx310.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.fr2.64PRB.prs.usrpx310.conf
@@ -216,18 +216,21 @@ MACRLCs = (
 
 prs_config = (
 {
-  PRSResourceSetPeriod0 = 40;
-  PRSResourceSetPeriod1 = 0;
-  SymbolStart = 7;
-  NumPRSSymbols = 7;
+  NumPRSResources = 1;
+  PRSResourceSetPeriod = [40, 0];
+  SymbolStart = [7];
+  NumPRSSymbols = [7];
   NumRB = 64;
   RBOffset = 0;
   CombSize = 4;
-  REOffset = 0;
-  PRSResourceOffset = 0;
+  REOffset = [0];
+  PRSResourceOffset = [0];
   PRSResourceRepetition = 1;
   PRSResourceTimeGap = 1;
-  NPRS_ID = 0;
+  NPRS_ID = [0];
+  MutingPattern1 = [];
+  MutingPattern2 = [];
+  MutingBitRepetition = 1;
 }
 );
 
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.prs.usrpn310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.prs.usrpn310.conf
index 228b718bc6..c0912cd19d 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.prs.usrpn310.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.prs.usrpn310.conf
@@ -217,18 +217,21 @@ MACRLCs = (
 
 prs_config = (
 {
-  PRSResourceSetPeriod0 = 40;
-  PRSResourceSetPeriod1 = 0;
-  SymbolStart = 7;
-  NumPRSSymbols = 7;
+  NumPRSResources = 1;
+  PRSResourceSetPeriod = [40, 0];
+  SymbolStart = [7];
+  NumPRSSymbols = [7];
   NumRB = 106;
   RBOffset = 0;
   CombSize = 4;
-  REOffset = 0;
-  PRSResourceOffset = 0;
+  REOffset = [0];
+  PRSResourceOffset = [0];
   PRSResourceRepetition = 1;
   PRSResourceTimeGap = 1;
-  NPRS_ID = 0;
+  NPRS_ID = [0];
+  MutingPattern1 = [];
+  MutingPattern2 = [];
+  MutingBitRepetition = 1;
 }
 );
 
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.prs.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.prs.usrpx310.conf
index 4b5052f2d3..c0642afba5 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.prs.usrpx310.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.prs.usrpx310.conf
@@ -217,18 +217,21 @@ MACRLCs = (
 
 prs_config = (
 {
-  PRSResourceSetPeriod0 = 40;
-  PRSResourceSetPeriod1 = 0;
-  SymbolStart = 7;
-  NumPRSSymbols = 7;
+  NumPRSResources = 1;
+  PRSResourceSetPeriod = [40, 0];
+  SymbolStart = [7];
+  NumPRSSymbols = [7];
   NumRB = 216;
   RBOffset = 0;
   CombSize = 4;
-  REOffset = 0;
-  PRSResourceOffset = 0;
+  REOffset = [0];
+  PRSResourceOffset = [0];
   PRSResourceRepetition = 1;
   PRSResourceTimeGap = 1;
-  NPRS_ID = 0;
+  NPRS_ID = [0];
+  MutingPattern1 = [];
+  MutingPattern2 = [];
+  MutingBitRepetition = 1;
 }
 );
 
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr1.106prb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr1.106prb.conf
index 38714e546e..04912424f2 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr1.106prb.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr1.106prb.conf
@@ -5,36 +5,42 @@ PRSs =
     prs_config0 = (
     {
       gNB_id = 0;
-      PRSResourceSetPeriod0 = 40;
-      PRSResourceSetPeriod1 = 0;
-      SymbolStart = 7;
-      NumPRSSymbols = 7;
+      NumPRSResources = 1;
+      PRSResourceSetPeriod = [40, 0];
+      SymbolStart = [7];
+      NumPRSSymbols = [7];
       NumRB = 106;
       RBOffset = 0;
       CombSize = 4;
-      REOffset = 0;
-      PRSResourceOffset = 0;
+      REOffset = [0];
+      PRSResourceOffset = [0];
       PRSResourceRepetition = 1;
       PRSResourceTimeGap = 1;
-      NPRS_ID = 0;
+      NPRS_ID = [0];
+      MutingPattern1 = [];
+      MutingPattern2 = [];
+      MutingBitRepetition = 1;
     }
     );
 
     prs_config1 = (
     {
       gNB_id = 1;
-      PRSResourceSetPeriod0 = 40;
-      PRSResourceSetPeriod1 = 0;
-      SymbolStart = 7;
-      NumPRSSymbols = 4;
+      NumPRSResources = 1;
+      PRSResourceSetPeriod = [40, 0];
+      SymbolStart = [7];
+      NumPRSSymbols = [7];
       NumRB = 106;
       RBOffset = 0;
       CombSize = 4;
-      REOffset = 1;
-      PRSResourceOffset = 0;
+      REOffset = [1];
+      PRSResourceOffset = [0];
       PRSResourceRepetition = 1;
       PRSResourceTimeGap = 1;
-      NPRS_ID = 0;
+      NPRS_ID = [0];
+      MutingPattern1 = [];
+      MutingPattern2 = [];
+      MutingBitRepetition = 1;
     }
     );
   }
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr1.217prb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr1.217prb.conf
index e84aac5b6a..3c76026015 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr1.217prb.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr1.217prb.conf
@@ -5,36 +5,42 @@ PRSs =
     prs_config0 = (
     {
       gNB_id = 0;
-      PRSResourceSetPeriod0 = 40;
-      PRSResourceSetPeriod1 = 0;
-      SymbolStart = 7;
-      NumPRSSymbols = 7;
+      NumPRSResources = 1;
+      PRSResourceSetPeriod = [40, 0];
+      SymbolStart = [7];
+      NumPRSSymbols = [7];
       NumRB = 216;
       RBOffset = 0;
       CombSize = 4;
-      REOffset = 0;
-      PRSResourceOffset = 0;
+      REOffset = [0];
+      PRSResourceOffset = [0];
       PRSResourceRepetition = 1;
       PRSResourceTimeGap = 1;
-      NPRS_ID = 0;
+      NPRS_ID = [0];
+      MutingPattern1 = [];
+      MutingPattern2 = [];
+      MutingBitRepetition = 1;
     }
     );
 
     prs_config1 = (
     {
       gNB_id = 1;
-      PRSResourceSetPeriod0 = 40;
-      PRSResourceSetPeriod1 = 0;
-      SymbolStart = 7;
-      NumPRSSymbols = 4;
-      NumRB = 106;
+      NumPRSResources = 1;
+      PRSResourceSetPeriod = [40, 0];
+      SymbolStart = [7];
+      NumPRSSymbols = [4];
+      NumRB = 216;
       RBOffset = 0;
       CombSize = 4;
-      REOffset = 1;
-      PRSResourceOffset = 0;
+      REOffset = [1];
+      PRSResourceOffset = [0];
       PRSResourceRepetition = 1;
       PRSResourceTimeGap = 1;
-      NPRS_ID = 0;
+      NPRS_ID = [5];
+      MutingPattern1 = [];
+      MutingPattern2 = [];
+      MutingBitRepetition = 1;
     }
     );
   }
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.128prb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.128prb.conf
index 27f30359b6..8619eca5f4 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.128prb.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.128prb.conf
@@ -5,36 +5,42 @@ PRSs =
     prs_config0 = (
     {
       gNB_id = 0;
-      PRSResourceSetPeriod0 = 40;
-      PRSResourceSetPeriod1 = 0;
-      SymbolStart = 7;
-      NumPRSSymbols = 7;
+      NumPRSResources = 1;
+      PRSResourceSetPeriod = [40, 0];
+      SymbolStart = [7];
+      NumPRSSymbols = [7];
       NumRB = 128;
       RBOffset = 0;
       CombSize = 4;
-      REOffset = 0;
-      PRSResourceOffset = 0;
+      REOffset = [0];
+      PRSResourceOffset = [0];
       PRSResourceRepetition = 1;
       PRSResourceTimeGap = 1;
-      NPRS_ID = 0;
+      NPRS_ID = [0];
+      MutingPattern1 = [];
+      MutingPattern2 = [];
+      MutingBitRepetition = 1;
     }
     );
 
     prs_config1 = (
     {
       gNB_id = 1;
-      PRSResourceSetPeriod0 = 40;
-      PRSResourceSetPeriod1 = 0;
-      SymbolStart = 7;
-      NumPRSSymbols = 4;
-      NumRB = 106;
+      NumPRSResources = 1;
+      PRSResourceSetPeriod = [40, 0];
+      SymbolStart = [7];
+      NumPRSSymbols = [4];
+      NumRB = 128;
       RBOffset = 0;
       CombSize = 4;
-      REOffset = 1;
-      PRSResourceOffset = 0;
+      REOffset = [1];
+      PRSResourceOffset = [0];
       PRSResourceRepetition = 1;
       PRSResourceTimeGap = 1;
-      NPRS_ID = 0;
+      NPRS_ID = [5];
+      MutingPattern1 = [];
+      MutingPattern2 = [];
+      MutingBitRepetition = 1;
     }
     );
   }
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.64prb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.64prb.conf
new file mode 100644
index 0000000000..2d04955726
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.64prb.conf
@@ -0,0 +1,47 @@
+PRSs =
+(
+  {
+    Active_gNBs = 1;
+    prs_config0 = (
+    {
+      gNB_id = 0;
+      NumPRSResources = 1;
+      PRSResourceSetPeriod = [40, 0];
+      SymbolStart = [7];
+      NumPRSSymbols = [7];
+      NumRB = 64;
+      RBOffset = 0;
+      CombSize = 4;
+      REOffset = [0];
+      PRSResourceOffset = [0];
+      PRSResourceRepetition = 1;
+      PRSResourceTimeGap = 1;
+      NPRS_ID = [0];
+      MutingPattern1 = [];
+      MutingPattern2 = [];
+      MutingBitRepetition = 1;
+    }
+    );
+
+    prs_config1 = (
+    {
+      gNB_id = 1;
+      NumPRSResources = 1;
+      PRSResourceSetPeriod = [40, 0];
+      SymbolStart = [7];
+      NumPRSSymbols = [4];
+      NumRB = 64;
+      RBOffset = 0;
+      CombSize = 4;
+      REOffset = [1];
+      PRSResourceOffset = [0];
+      PRSResourceRepetition = 1;
+      PRSResourceTimeGap = 1;
+      NPRS_ID = [5];
+      MutingPattern1 = [];
+      MutingPattern2 = [];
+      MutingBitRepetition = 1;
+    }
+    );
+  }
+);
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.66prb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.66prb.conf
deleted file mode 100644
index a1c129348a..0000000000
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.66prb.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-PRSs =
-(
-  {
-    Active_gNBs = 1;
-    prs_config0 = (
-    {
-      gNB_id = 0;
-      PRSResourceSetPeriod0 = 40;
-      PRSResourceSetPeriod1 = 0;
-      SymbolStart = 7;
-      NumPRSSymbols = 7;
-      NumRB = 64;
-      RBOffset = 0;
-      CombSize = 4;
-      REOffset = 0;
-      PRSResourceOffset = 0;
-      PRSResourceRepetition = 1;
-      PRSResourceTimeGap = 1;
-      NPRS_ID = 0;
-    }
-    );
-
-    prs_config1 = (
-    {
-      gNB_id = 1;
-      PRSResourceSetPeriod0 = 40;
-      PRSResourceSetPeriod1 = 0;
-      SymbolStart = 7;
-      NumPRSSymbols = 4;
-      NumRB = 106;
-      RBOffset = 0;
-      CombSize = 4;
-      REOffset = 1;
-      PRSResourceOffset = 0;
-      PRSResourceRepetition = 1;
-      PRSResourceTimeGap = 1;
-      NPRS_ID = 0;
-    }
-    );
-  }
-);