diff --git a/docker/Dockerfile.eNB.ubuntu18 b/docker/Dockerfile.eNB.ubuntu18
index 4e79813621..23cea729ca 100644
--- a/docker/Dockerfile.eNB.ubuntu18
+++ b/docker/Dockerfile.eNB.ubuntu18
@@ -67,17 +67,16 @@ COPY --from=enb-build \
     /oai-ran/docker/scripts/entrypoint.sh \
     ./
 
-WORKDIR /usr/local/lib/
 COPY --from=enb-build \
-     /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 \
-     /oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 \
-     /oai-ran/targets/bin/librfsimulator.so.Rel15 \
-     /oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 \
-     /oai-ran/targets/bin/libcoding.so \
-     /oai-ran/targets/bin/libparams_libconfig.so \
+     /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+     /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
+     /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+     /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+     /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+     /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
      /oai-ran/cmake_targets/ran_build/build/libdfts.so \
      /oai-ran/cmake_targets/ran_build/build/liboai_iqplayer.so \
-     ./
+     /usr/local/lib/
 
 # Now we are copying from builder-image the UHD files.
 COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin
@@ -86,7 +85,6 @@ COPY --from=enb-base \
      /usr/local/lib/libprotobuf-c.so.1 \
      /usr/local/lib/
 COPY --from=enb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
-WORKDIR /usr/lib/x86_64-linux-gnu
 COPY --from=enb-base \
      /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \
      /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \
@@ -95,11 +93,9 @@ COPY --from=enb-base \
      /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \
      /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \
      /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \
-     ./
+     /usr/lib/x86_64-linux-gnu/
 
-RUN /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so.Rel15 /usr/local/lib/liboai_transpro.so" && \
-    /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so.Rel15 /usr/local/lib/liboai_device.so" && \
-    /bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so" && \
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
     ldconfig
 
 # Copy the relevant configuration files for eNB
diff --git a/docker/Dockerfile.gNB.ubuntu18 b/docker/Dockerfile.gNB.ubuntu18
index 2d5bc754a1..66c5d7703f 100644
--- a/docker/Dockerfile.gNB.ubuntu18
+++ b/docker/Dockerfile.gNB.ubuntu18
@@ -66,20 +66,19 @@ COPY --from=gnb-build \
     /oai-ran/docker/scripts/entrypoint.sh \
     ./
 
-WORKDIR /usr/local/lib/
 COPY --from=gnb-build \
-    /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 \
-    /oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 \
-    /oai-ran/targets/bin/librfsimulator.so.Rel15 \
-    /oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 \
-    /oai-ran/targets/bin/libcoding.so \
-    /oai-ran/targets/bin/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
     /oai-ran/cmake_targets/ran_build/build/libdfts.so \
     /oai-ran/cmake_targets/ran_build/build/libldpc.so \
     /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
     /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
     /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
-    ./
+    /usr/local/lib/
 
 # Now we are copying from builder-image the UHD files.
 COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin
@@ -88,7 +87,6 @@ COPY --from=gnb-base \
      /usr/local/lib/libprotobuf-c.so.1 \
      /usr/local/lib/
 COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
-WORKDIR /usr/lib/x86_64-linux-gnu
 COPY --from=gnb-base \
     /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \
@@ -97,11 +95,9 @@ COPY --from=gnb-base \
     /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \
-    ./
+    /usr/lib/x86_64-linux-gnu/
 
-RUN /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so.Rel15 /usr/local/lib/liboai_transpro.so" && \
-    /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so.Rel15 /usr/local/lib/liboai_device.so" && \
-    /bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so" && \
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
     ldconfig
 
 # Copy the relevant configuration files for gNB
diff --git a/docker/Dockerfile.lteRU.ubuntu18 b/docker/Dockerfile.lteRU.ubuntu18
index c9c076dd76..1f1c903a15 100644
--- a/docker/Dockerfile.lteRU.ubuntu18
+++ b/docker/Dockerfile.lteRU.ubuntu18
@@ -62,22 +62,20 @@ COPY --from=ru-build \
     /oai-ran/docker/scripts/entrypoint.sh \
     ./
 
-WORKDIR /usr/local/lib/
 COPY --from=ru-build \
-    /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 \
-    /oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 \
-    /oai-ran/targets/bin/librfsimulator.so.Rel15 \
-    /oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 \
-    /oai-ran/targets/bin/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
     /oai-ran/cmake_targets/ran_build/build/libdfts.so \
-    ./
+    /usr/local/lib/
 
 # Now we are copying from builder-image the UHD files.
 COPY --from=ru-base /usr/local/bin/uhd_find_devices /usr/local/bin
 COPY --from=ru-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib
 COPY --from=ru-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin
 
-WORKDIR /usr/lib/x86_64-linux-gnu
 COPY --from=ru-base \
     /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \
@@ -85,11 +83,9 @@ COPY --from=ru-base \
     /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \
-    ./
+    /usr/lib/x86_64-linux-gnu/
 
-RUN /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so.Rel15 /usr/local/lib/liboai_transpro.so" && \
-    /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so.Rel15 /usr/local/lib/liboai_device.so" && \
-    /bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so" && \
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
     ldconfig
 
 # Copy the relevant configuration files for RRU
diff --git a/docker/Dockerfile.lteUE.ubuntu18 b/docker/Dockerfile.lteUE.ubuntu18
index c6c7060df5..70394d8a4b 100644
--- a/docker/Dockerfile.lteUE.ubuntu18
+++ b/docker/Dockerfile.lteUE.ubuntu18
@@ -71,17 +71,16 @@ COPY --from=lte-ue-build \
     /oai-ran/targets/bin/usim \
     ./
 
-WORKDIR /usr/local/lib/
 COPY --from=lte-ue-build \
-    /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 \
-    /oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 \
-    /oai-ran/targets/bin/librfsimulator.so.Rel15 \
-    /oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 \
-    /oai-ran/targets/bin/libcoding.so \
-    /oai-ran/targets/bin/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
     /oai-ran/cmake_targets/ran_build/build/libSIMU.so \
     /oai-ran/cmake_targets/ran_build/build/libdfts.so \
-    ./
+    /usr/local/lib/
 
 # Now we are copying from builder-image the UHD files.
 COPY --from=lte-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin
@@ -91,7 +90,6 @@ COPY --from=lte-ue-base \
      /usr/local/lib/
 COPY --from=lte-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin
 
-WORKDIR /usr/lib/x86_64-linux-gnu
 COPY --from=lte-ue-base \
     /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \
@@ -100,11 +98,9 @@ COPY --from=lte-ue-base \
     /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \
-    ./
+    /usr/lib/x86_64-linux-gnu/
 
-RUN /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so.Rel15 /usr/local/lib/liboai_transpro.so" && \
-    /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so.Rel15 /usr/local/lib/liboai_device.so" && \
-    /bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so" && \
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
     ldconfig
 
 # Copy the relevant configuration files for UE
diff --git a/docker/Dockerfile.nrUE.ubuntu18 b/docker/Dockerfile.nrUE.ubuntu18
index 63b0b7f498..021e8d39cf 100644
--- a/docker/Dockerfile.nrUE.ubuntu18
+++ b/docker/Dockerfile.nrUE.ubuntu18
@@ -69,20 +69,19 @@ COPY --from=nr-ue-build \
 WORKDIR /opt/oai-nr-ue/etc
 COPY --from=nr-ue-build /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf .
 
-WORKDIR /usr/local/lib/
 COPY --from=nr-ue-build \
-    /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 \
-    /oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 \
-    /oai-ran/targets/bin/librfsimulator.so.Rel15 \
-    /oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 \
-    /oai-ran/targets/bin/libcoding.so \
-    /oai-ran/targets/bin/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
     /oai-ran/cmake_targets/ran_build/build/libdfts.so \
     /oai-ran/cmake_targets/ran_build/build/libldpc.so \
     /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
     /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
     /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
-    ./
+    /usr/local/lib/
 
 # Now we are copying from builder-image the UHD files.
 COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin
@@ -92,7 +91,6 @@ COPY --from=nr-ue-base \
      /usr/local/lib/
 COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin
 
-WORKDIR /usr/lib/x86_64-linux-gnu
 COPY --from=nr-ue-base \
     /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \
@@ -101,11 +99,9 @@ COPY --from=nr-ue-base \
     /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \
     /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \
-    ./
+    /usr/lib/x86_64-linux-gnu/
 
-RUN /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so.Rel15 /usr/local/lib/liboai_transpro.so" && \
-    /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so.Rel15 /usr/local/lib/liboai_device.so" && \
-    /bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so" && \
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
     ldconfig
 
 WORKDIR /opt/oai-nr-ue