diff --git a/.travis.yml b/.travis.yml
index f09314b..6bae8c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: c
 compiler: gcc
 sudo: required
-dist: xenial
+dist: bionic
 
 before_install:
   - export ALL_DEB=$(wget --quiet -O - ${KERNEL_URL}v${KVER}/ | grep -o 'href=".*"' | grep -m1 all | cut -d '"' -f 2)
@@ -22,48 +22,38 @@ matrix:
       addons:
         apt:
           sources:
-            - sourceline: 'ppa:ondrej/nginx-mainline'
+            - ubuntu-toolchain-r-test
           packages:
-            - libssl1.1
-      env: COMPILER=gcc-5 KVER=5.4.4
+            - gcc-8
+      env: COMPILER=gcc-8 KVER=5.4.4
+    - compiler: gcc
+      env: COMPILER=gcc-7 KVER=5.4.4
     - compiler: gcc
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:ondrej/nginx-mainline'
           packages:
             - gcc-6
-            - libssl1.1
       env: COMPILER=gcc-6 KVER=5.4.4
     - compiler: gcc
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:ondrej/nginx-mainline'
           packages:
-            - gcc-7
-            - libssl1.1
-      env: COMPILER=gcc-7 KVER=5.4.4
+            - gcc-8
+      env: COMPILER=gcc-8 KVER=4.19.86
     - compiler: gcc
-      addons:
-        apt:
-          sources:
-            - sourceline: 'ppa:ondrej/nginx-mainline'
-          packages:
-            - libssl1.1
-      env: COMPILER=gcc-5 KVER=4.19.67
+      env: COMPILER=gcc-7 KVER=4.19.86
     - compiler: gcc
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:ondrej/nginx-mainline'
           packages:
             - gcc-6
-            - libssl1.1
-      env: COMPILER=gcc-6 KVER=4.19.67
+      env: COMPILER=gcc-6 KVER=4.19.86
     - compiler: gcc
       addons:
         apt:
@@ -72,15 +62,4 @@ matrix:
             - sourceline: 'ppa:ondrej/nginx-mainline'
           packages:
             - gcc-7
-            - libssl1.1
-      env: COMPILER=gcc-7 KVER=4.19.67
-    - compiler: gcc
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:ondrej/nginx-mainline'
-          packages:
-            - gcc-7
-            - libssl1.1
       env: COMPILER=gcc-7 KVER=4.15.18