diff --git a/.travis.yml b/.travis.yml
index 66e05c24fe..7a70657851 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ cache:
 #   https://github.com/travis-ci/travis-ci/issues/5142
 matrix:
   include:
-    - env: ['os_image=ubuntu:16.04', gcc_version=5]
+    - env: ['os_image=ubuntu:18.04', gcc_version=7]
       services: [docker]
 
 addons:
diff --git a/build/fbcode_builder/make_docker_context.py b/build/fbcode_builder/make_docker_context.py
index 30aad9e821..11986ca65c 100755
--- a/build/fbcode_builder/make_docker_context.py
+++ b/build/fbcode_builder/make_docker_context.py
@@ -45,6 +45,7 @@ def make_docker_context(
 
     valid_versions = (
         ('ubuntu:16.04', '5'),
+        ('ubuntu:18.04', '7'),
     )
 
     def add_args(parser):