diff --git a/ci-scripts/oai-ci-vm-tool b/ci-scripts/oai-ci-vm-tool
index c343e24d80..ab28cd5204 100755
--- a/ci-scripts/oai-ci-vm-tool
+++ b/ci-scripts/oai-ci-vm-tool
@@ -236,7 +236,7 @@ case $key in
     VM_NAME=ci-enb-usrp
     ARCHIVES_LOC=enb_usrp
     LOG_PATTERN=.Rel14.txt
-    NB_PATTERN_FILES=7
+    NB_PATTERN_FILES=9
     BUILD_OPTIONS="--eNB -w USRP --mu"
     NBARGS=$[$NBARGS+256]
     shift
@@ -245,8 +245,8 @@ case $key in
     VM_NAME=ci-basic-sim
     ARCHIVES_LOC=basic_sim
     LOG_PATTERN=basic_simulator
-    NB_PATTERN_FILES=2
-    BUILD_OPTIONS="--basic-simulator"
+    NB_PATTERN_FILES=13
+    BUILD_OPTIONS="--eNB --UE"
     VM_MEMORY=8192
     VM_CPU=4
     RUN_OPTIONS="complex"
@@ -279,8 +279,8 @@ case $key in
     VM_CPU=4
     ARCHIVES_LOC=enb_eth
     LOG_PATTERN=.Rel14.txt
-    NB_PATTERN_FILES=6
-    BUILD_OPTIONS="--eNB -t ETHERNET"
+    NB_PATTERN_FILES=8
+    BUILD_OPTIONS="--eNB"
     NBARGS=$[$NBARGS+256]
     shift
     ;;
@@ -290,8 +290,8 @@ case $key in
     VM_CPU=4
     ARCHIVES_LOC=ue_eth
     LOG_PATTERN=.Rel14.txt
-    NB_PATTERN_FILES=10
-    BUILD_OPTIONS="--UE -t ETHERNET"
+    NB_PATTERN_FILES=12
+    BUILD_OPTIONS="--UE"
     NBARGS=$[$NBARGS+256]
     shift
     ;;
@@ -332,7 +332,7 @@ case $key in
         VM_NAME=ci-enb-usrp
         ARCHIVES_LOC=enb_usrp
         LOG_PATTERN=.Rel14.txt
-        NB_PATTERN_FILES=7
+        NB_PATTERN_FILES=9
         BUILD_OPTIONS="--eNB -w USRP --mu"
         NBARGS=$[$NBARGS+256]
         ;;
@@ -340,8 +340,8 @@ case $key in
         VM_NAME=ci-basic-sim
         ARCHIVES_LOC=basic_sim
         LOG_PATTERN=basic_simulator
-        NB_PATTERN_FILES=2
-        BUILD_OPTIONS="--basic-simulator"
+        NB_PATTERN_FILES=13
+        BUILD_OPTIONS="--UE --eNB"
         VM_MEMORY=8192
         VM_CPU=4
         RUN_OPTIONS="complex"
@@ -371,8 +371,8 @@ case $key in
         VM_CPU=4
         ARCHIVES_LOC=enb_eth
         LOG_PATTERN=.Rel14.txt
-        NB_PATTERN_FILES=6
-        BUILD_OPTIONS="--eNB -t ETHERNET"
+        NB_PATTERN_FILES=8
+        BUILD_OPTIONS="--eNB"
         NBARGS=$[$NBARGS+256]
         ;;
         ue-ethernet)
@@ -381,8 +381,8 @@ case $key in
         VM_CPU=4
         ARCHIVES_LOC=ue_eth
         LOG_PATTERN=.Rel14.txt
-        NB_PATTERN_FILES=10
-        BUILD_OPTIONS="--UE -t ETHERNET"
+        NB_PATTERN_FILES=12
+        BUILD_OPTIONS="--UE"
         NBARGS=$[$NBARGS+256]
         ;;
         flexran-rtc)
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 74627d620d..b4b807331d 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -67,7 +67,7 @@ UE_DEBUG_TRACE="False"
 UE_TIMING_TRACE="False"
 USRP_REC_PLAY="False"
 BUILD_ECLIPSE=0
-BASIC_SIMULATOR=0
+
 trap handle_ctrl_c INT
 
 function print_help() {
@@ -107,11 +107,8 @@ Options
    Rel8 limits the implementation to 3GPP Release 8 version
    Rel10 limits the implementation to 3GPP Release 10 version
 -w | --hardware
-   EXMIMO, USRP, BLADERF, ETHERNET, LMSSDR, IRIS, None (Default)
+   EXMIMO, USRP, BLADERF, LMSSDR, IRIS, None (Default)
    Adds this RF board support (in external packages installation and in compilation)
--t | --transport protocol
-   ETHERNET , None
-   Adds this trasport protocol support in compilation
 --phy_simulators
    Makes the unitary tests Layer 1 simulators
 --core_simulators
@@ -246,14 +243,6 @@ function main() {
                 esac
 		echo_info "Setting hardware to: $HW"
             shift 2;;
-	-t | --transport_protocol)
-            TP="$2" #"${i#*=}"
-	    if [ "$TP" != "ETHERNET" -a "$TP" != "None" ] ; then 
-		echo_fatal "Unknown TP type $TP will exit..."		
-	    else
-		echo_info "Setting transport protocol to: $TP"		
-	    fi
-            shift 2;;
        --phy_simulators)
             SIMUS_PHY=1
             echo_info "Will compile dlsim, ulsim, ..."
@@ -350,14 +339,6 @@ function main() {
             USRP_REC_PLAY="True"
             echo_info "Enabling USRP record playback mode"
             shift 1;;
-        --basic-simulator)
-            BASIC_SIMULATOR=1
-            echo_info "Compiling the basic simulator device"
-            shift 1;;
-	--rfsimulator)
-	    RFSIMULATOR=true
-	    echo_info "Compiling the RF simulator device"
-	    shift 1;;
         -h | --help)
             print_help
             exit 1;;
@@ -377,7 +358,7 @@ function main() {
   
   if [ "$eNB" = "1" ] ; then
       if [ "$HW" = "None" -a  "$TP" = "None" ] ; then
-	  echo_fatal "Define a local radio head (e.g. -w EXMIMO) or a transport protocol (e.g. -t ETHERNET) to communicate with a remote radio head!"
+	  echo_info "No local radio head and no transport protocol selected"
       fi
       if [ "$HW" = "None" ] ; then 
 	  echo_info "No radio head has been selected (HW set to $HW)"