diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 004601ac0..3562229c1 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -1,21 +1,34 @@
 name: C/C++ CI
 on: push
 jobs:
-  x86_build:
-    name: Build and test on x86
+  x86_ubuntu18_build:
+    name: Build and test on x86 Ubuntu 18.04
     strategy:
         matrix:
           cc: [ gcc ]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
       - name: Build srsLTE on x86
         run: |
           sudo apt update
           sudo apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev colordiff ninja-build valgrind
-          mkdir build && cd build && cmake -GNinja .. && ninja && ctest -T memcheck
-    
-  aarch64_build:
+          mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja && ctest -T memcheck
+  x86_ubuntu16_build:
+    name: Build and test on x86 Ubuntu 16.04
+    strategy:
+        matrix:
+          cc: [ gcc ]
+    runs-on: ubuntu-16.04
+    steps:
+      - uses: actions/checkout@v1
+      - name: Build srsLTE on x86
+        run: |
+          sudo apt update
+          sudo apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev colordiff ninja-build valgrind
+          mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja && ctest -T memcheck
+          
+  aarch64_ubuntu18_build:
     runs-on: ubuntu-18.04
     name: Build on aarch64
     steps:
@@ -28,4 +41,4 @@ jobs:
         run: |
           apt update
           apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev ninja-build
-          ls -l && pwd && mkdir build && cd build && cmake -GNinja .. && ninja
+          ls -l && pwd && mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja
diff --git a/.travis.yml b/.travis.yml
index dafeec8b4..eb515b573 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,11 @@
-dist: xenial
+dist: bionic
 sudo: required
 
 before_script:
    - sudo apt-get -qq update
-   - sudo apt-get install -qq build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev colordiff
+   - sudo apt-get install -qq build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev colordiff ninja-build
 
 language: cpp
-
-matrix:
-  include:
-    # works on Precise and Trusty
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-8
-            - key_url: 'http://apt.llvm.org/llvm-snapshot.gpg.key'
-          packages:
-            - clang-format-8
-            - clang-8
-      env:
-        - MATRIX_EVAL="CC=clang-8 && CXX=clang++-8"
-        
-before_install:
-    - eval "${MATRIX_EVAL}"        
         
 compiler:
   - gcc
@@ -52,7 +34,7 @@ script:
    fi
  - mkdir build
  - cd build
- - cmake -DRF_FOUND=True ..
- - make
- - make test
- - sudo make install
+ - cmake -DRF_FOUND=True -G Ninja ..
+ - ninja
+ - ninja test
+ - sudo ninja install