diff --git a/docker/Dockerfile.base.ubuntu b/docker/Dockerfile.base.ubuntu
index ee42085a40..3d7e162544 100644
--- a/docker/Dockerfile.base.ubuntu
+++ b/docker/Dockerfile.base.ubuntu
@@ -51,7 +51,10 @@ RUN apt-get update && \
        m4 \
        # python3-pip for conf template generation
        python3-pip \
-       wget && \
+       wget \
+       flatbuffers-compiler \
+       libflatbuffers-dev \
+       libnanomsg-dev && \
     # --break-system-packages allows externally managed environment in pip 
     pip3 install --ignore-installed pyyaml --break-system-packages
 
diff --git a/docker/Dockerfile.build.ubuntu b/docker/Dockerfile.build.ubuntu
index b2cc9c6888..9ccd921043 100644
--- a/docker/Dockerfile.build.ubuntu
+++ b/docker/Dockerfile.build.ubuntu
@@ -49,6 +49,7 @@ RUN \
       --build-lib "telnetsrv enbscope uescope nrscope" \
       -w USRP -t Ethernet \
       --build-e2 --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
+      --cmake-opt -DOAI_VRTSIM_TAPS_CLIENT=ON \
       --noavx512 \
       --build-tool-opt -k10 \
       --cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" $BUILD_OPTION && \
diff --git a/docker/Dockerfile.gNB.ubuntu b/docker/Dockerfile.gNB.ubuntu
index c88857f2d6..45017486b3 100644
--- a/docker/Dockerfile.gNB.ubuntu
+++ b/docker/Dockerfile.gNB.ubuntu
@@ -64,7 +64,8 @@ RUN apt-get update && \
         python3-six \
         python3-requests \
         libusb-1.0-0 \
-        libyaml-cpp-dev && \
+        libyaml-cpp-dev \
+        libnanomsg5 && \
 # if the --sanitize option was used to build, additional packages are required
     /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libasan8 \ 
diff --git a/docker/Dockerfile.nrUE.ubuntu b/docker/Dockerfile.nrUE.ubuntu
index 3b55a64acd..806e2b635f 100644
--- a/docker/Dockerfile.nrUE.ubuntu
+++ b/docker/Dockerfile.nrUE.ubuntu
@@ -65,7 +65,8 @@ RUN apt-get update && \
         iproute2 \
         iperf3 \
         iperf \
-        libyaml-cpp-dev && \
+        libyaml-cpp-dev \
+        libnanomsg5 && \
 # if the --sanitize option was used to build, additional packages are required
     /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libasan8 \
diff --git a/radio/vrtsim/CMakeLists.txt b/radio/vrtsim/CMakeLists.txt
index 998b791653..71d18cc5bc 100644
--- a/radio/vrtsim/CMakeLists.txt
+++ b/radio/vrtsim/CMakeLists.txt
@@ -26,6 +26,14 @@ if (OAI_VRTSIM_TAPS_CLIENT)
 
   add_library(taps_client taps_client.cpp ${TAPS_API_HEADER})
   target_include_directories(taps_client PUBLIC .)
-  find_package(Flatbuffers REQUIRED)
+  find_package(FlatBuffers QUIET)
+  if(NOT FlatBuffers_FOUND)
+    # Fall back to lowercase (Ubuntu 22.04)
+    find_package(Flatbuffers REQUIRED)
+    set(FLATBUFFERS_TARGET flatbuffers)
+  else()
+    set(FLATBUFFERS_TARGET flatbuffers::flatbuffers)
+  endif()
+  target_link_libraries(taps_client PUBLIC ${FLATBUFFERS_TARGET})
   target_link_libraries(taps_client PUBLIC flatbuffers taps_api SIMU nanomsg)
 endif()
diff --git a/radio/vrtsim/vrtsim.c b/radio/vrtsim/vrtsim.c
index 38dea17d76..1b2b075bd0 100644
--- a/radio/vrtsim/vrtsim.c
+++ b/radio/vrtsim/vrtsim.c
@@ -189,13 +189,13 @@ static void vrtsim_readconfig(vrtsim_state_t *vrtsim_state)
   } else {
     AssertFatal(false, "Invalid role configuration\n");
   }
-#ifdef ENABLE_TAPS_CLIENT
+#ifdef OAI_VRTSIM_TAPS_CLIENT
   if (vrtsim_state->taps_socket) {
     LOG_A(HW, "VRTSIM: will use taps socket %s\n", vrtsim_state->taps_socket);
   }
 #else
   if (vrtsim_state->taps_socket) {
-    AssertFatal(false, "Invalid configuration: Build with ENABLE_TAPS_CLIENT to use taps socket\n");
+    AssertFatal(false, "Invalid configuration: Build with OAI_VRTSIM_TAPS_CLIENT to use taps socket\n");
   }
 #endif
 }