diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
index 2550662fa6..8ab0422eeb 100644
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
@@ -5,7 +5,7 @@ Asn1_verbosity = "none";
 e2_agent = {
    enabled = "yes";
    near_ric_ip_addr = "192.168.71.21";
-   near_ric_port = 36421;
+   near_ric_port = 36422;
    sm_dir = "/usr/local/lib/flexric/";
 }
 
diff --git a/docker/Dockerfile.nakaolab.oct29 b/docker/Dockerfile.nakaolab.oct29
index 35e84af67f..993ac2626d 100644
--- a/docker/Dockerfile.nakaolab.oct29
+++ b/docker/Dockerfile.nakaolab.oct29
@@ -13,7 +13,7 @@ RUN /bin/sh oaienv && \
       --gNB --RU --nrUE -w SIMU\
       --build-lib "telnetsrv enbscope uescope nrscope" \
       -w USRP -t Ethernet \
-      --build-e2 --cmake-opt -DKPM_VERSION=KPM_V2_03 --cmake-opt -DE2AP_VERSION=E2AP_V2 \
+      --build-e2 --cmake-opt -DKPM_VERSION=KPM_V3_00 --cmake-opt -DE2AP_VERSION=E2AP_V3 \
       --noavx512 \
       --build-tool-opt -k10 \
       --cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" $BUILD_OPTION && \
diff --git a/docker/Dockerfile.nakaolab.test b/docker/Dockerfile.nakaolab.test
index 5c32620860..a2466f74f3 100644
--- a/docker/Dockerfile.nakaolab.test
+++ b/docker/Dockerfile.nakaolab.test
@@ -13,7 +13,7 @@ RUN /bin/sh oaienv && \
       --gNB --RU --nrUE -w SIMU\
       --build-lib "telnetsrv enbscope uescope nrscope" \
       -w USRP -t Ethernet \
-      --build-e2 --cmake-opt -DKPM_VERSION=KPM_V2_03 --cmake-opt -DE2AP_VERSION=E2AP_V2 \
+      --build-e2 --cmake-opt -DKPM_VERSION=KPM_V3_00 --cmake-opt -DE2AP_VERSION=E2AP_V3 \
       --noavx512 \
       --build-tool-opt -k10 \
       --cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" $BUILD_OPTION && \
diff --git a/flexric/etc/flexric/flexric.conf b/flexric/etc/flexric/flexric.conf
index a9417505d4..5e4bd65bd1 100644
--- a/flexric/etc/flexric/flexric.conf
+++ b/flexric/etc/flexric/flexric.conf
@@ -1,5 +1,7 @@
 [NEAR-RIC]
 NEAR_RIC_IP = 192.168.71.21
+NEAR_RIC_PORT = 36422
+E2AP_SERVER_PORT = 36422
 
 [XAPP]
 DB_DIR = /tmp/
diff --git a/flexric/lib/flexric/libgtp_sm.so b/flexric/lib/flexric/libgtp_sm.so
index 68bf80a4bd..77932d8e70 100644
Binary files a/flexric/lib/flexric/libgtp_sm.so and b/flexric/lib/flexric/libgtp_sm.so differ
diff --git a/flexric/lib/flexric/libkpm_sm.so b/flexric/lib/flexric/libkpm_sm.so
index 7b05bcb21b..b9a87ceeb5 100644
Binary files a/flexric/lib/flexric/libkpm_sm.so and b/flexric/lib/flexric/libkpm_sm.so differ
diff --git a/flexric/lib/flexric/libmac_sm.so b/flexric/lib/flexric/libmac_sm.so
index 94ef40eacc..7316547231 100644
Binary files a/flexric/lib/flexric/libmac_sm.so and b/flexric/lib/flexric/libmac_sm.so differ
diff --git a/flexric/lib/flexric/libpdcp_sm.so b/flexric/lib/flexric/libpdcp_sm.so
index c22c5ce201..8732f5ed90 100644
Binary files a/flexric/lib/flexric/libpdcp_sm.so and b/flexric/lib/flexric/libpdcp_sm.so differ
diff --git a/flexric/lib/flexric/librc_sm.so b/flexric/lib/flexric/librc_sm.so
index 561c055103..1e577fa8a8 100644
Binary files a/flexric/lib/flexric/librc_sm.so and b/flexric/lib/flexric/librc_sm.so differ
diff --git a/flexric/lib/flexric/librlc_sm.so b/flexric/lib/flexric/librlc_sm.so
index f4a68e6a4d..480f889d1d 100644
Binary files a/flexric/lib/flexric/librlc_sm.so and b/flexric/lib/flexric/librlc_sm.so differ
diff --git a/flexric/lib/flexric/libslice_sm.so b/flexric/lib/flexric/libslice_sm.so
index bf2cf6236a..5e78610b56 100644
Binary files a/flexric/lib/flexric/libslice_sm.so and b/flexric/lib/flexric/libslice_sm.so differ
diff --git a/flexric/lib/flexric/libtc_sm.so b/flexric/lib/flexric/libtc_sm.so
index 940215bf3b..12869cf36f 100644
Binary files a/flexric/lib/flexric/libtc_sm.so and b/flexric/lib/flexric/libtc_sm.so differ