diff --git a/docker/Dockerfile.gNB.aerial.ubuntu20 b/docker/Dockerfile.gNB.aerial.ubuntu20
index cb7d0d521d..3984e236cb 100644
--- a/docker/Dockerfile.gNB.aerial.ubuntu20
+++ b/docker/Dockerfile.gNB.aerial.ubuntu20
@@ -77,6 +77,7 @@ RUN apt-get update && \
         iproute2 \
         iputils-ping \
         gdb \
+        moreutils \
         libusb-1.0-0 && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf
index b3d7171784..9aa5e93e77 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -4,6 +4,7 @@ Asn1_verbosity = "none";
 
 sa = 1;
 nfapi = "AERIAL";
+pdcp-drop = 1;
 
 gNBs =
 (
@@ -25,15 +26,16 @@ gNBs =
                   );
                   });
 
-    nr_cellid = 12345678L;
+    nr_cellid = 51L;
 
     ////////// Physical parameters:
 
     pdsch_AntennaPorts_XP = 2;
+    #pdsch_AntennaPorts_N1 = 2; #Uncomment for 4 layers
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
     do_SRS                = 0;
-    min_rxtxtime          = 2;
+    min_rxtxtime          = 3;
 
     pdcch_ConfigSIB1 = (
       {
@@ -46,7 +48,7 @@ gNBs =
     {
  #spCellConfigCommon
 
-      physCellId                                                    = 0;
+      physCellId                                                    = 51;
 
 #  downlinkConfigCommon
     #frequencyInfoDL
@@ -168,13 +170,13 @@ gNBs =
       # pattern1
       # dl_UL_TransmissionPeriodicity
       # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5; #6;
-      nrofDownlinkSlots                                             = 3; #7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1; #2;
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 6;
+      nrofDownlinkSymbols                                           = 10;
+      nrofUplinkSlots                                               = 3;
       nrofUplinkSymbols                                             = 0;
 
-      ssPBCH_BlockPower                                             = -25;
+      ssPBCH_BlockPower                                             = -34;
   }
 
   );
@@ -190,13 +192,20 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.70.132"; });
+    amf_ip_address      = ( { ipv4       = "192.168.70.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129/24";
+        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
@@ -206,6 +215,7 @@ gNBs =
 MACRLCs = (
 {
   num_cc           = 1;
+  local_s_if_name  = "lo:";
   remote_s_address = "127.0.0.1"; // pnf addr [!]
   local_s_address  = "127.0.0.2"; // vnf addr
   local_s_portc    = 50001; // vnf p5 port
@@ -214,11 +224,12 @@ MACRLCs = (
   remote_s_portd   = 50010; // pnf p7 port [!]
   tr_s_preference             = "aerial";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200; #150;
-  pucch_TargetSNRx10          = 200; #200;
+  pusch_FailureThres          = 10;
+  pusch_TargetSNRx10          = 280; # 150;
+  pucch_TargetSNRx10          = 100; #200;
   ulsch_max_frame_inactivity  = 10;
-  dl_max_mcs = 28;
-  ul_max_mcs = 28;
+  dl_max_mcs = 25;
+  ul_max_mcs = 25;
 }
 );