diff --git a/buildspec-linux-clang.yml b/buildspec-linux-clang.yml
index cac3f692e61..51e7626ea9d 100644
--- a/buildspec-linux-clang.yml
+++ b/buildspec-linux-clang.yml
@@ -2,16 +2,12 @@ version: 0.2
 
 phases:
   install:
+    runtime-versions:
+      java: openjdk8
     commands:
       - sed -i 's#/archive.ubuntu.com#/us-east-1.ec2.archive.ubuntu.com#g' /etc/apt/sources.list
-      - add-apt-repository ppa:ubuntu-toolchain-r/test -y
-      - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA9EF27F
-      - add-apt-repository ppa:openjdk-r/ppa -y
       - apt-get update -y
-      - apt-get install -y g++-5 clang-7 flex bison make git libwww-perl patch ccache libc6-dev-i386 jq
-      - apt-get install -y openjdk-8-jdk
-      - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
-      - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
+      - apt-get install -y clang-7 flex bison make git libwww-perl patch ccache libc6-dev-i386 jq
   build:
     commands:
       - echo Build started on `date`
diff --git a/buildspec-linux-cmake-gcc.yml b/buildspec-linux-cmake-gcc.yml
index 33b9fd3bbf4..dcd2794a2cc 100644
--- a/buildspec-linux-cmake-gcc.yml
+++ b/buildspec-linux-cmake-gcc.yml
@@ -2,20 +2,16 @@ version: 0.2
 
 phases:
   install:
+    runtime-versions:
+      java: openjdk8
     commands:
       - sed -i 's#/archive.ubuntu.com#/us-east-1.ec2.archive.ubuntu.com#g' /etc/apt/sources.list
-      - add-apt-repository ppa:ubuntu-toolchain-r/test -y
-      - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA9EF27F
-      - add-apt-repository ppa:openjdk-r/ppa -y
       - apt-get update -y
-      - apt-get install -y g++-5 flex bison make git libwww-perl patch ccache libc6-dev-i386 jq
-      - apt-get install -y openjdk-8-jdk
-      - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
-      - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
+      - apt-get install -y flex bison make git libwww-perl patch ccache libc6-dev-i386 jq
   build:
     commands:
       - echo Build started on `date`
-      - cmake -H. -Bbuild '-DCMAKE_BUILD_TYPE=Release'  '-DCMAKE_CXX_COMPILER=/usr/bin/g++-5'
+      - cmake -H. -Bbuild '-DCMAKE_BUILD_TYPE=Release'  '-DCMAKE_CXX_COMPILER=/usr/bin/g++'
       - git submodule update --init --recursive
       - cmake --build build -- -j2
   post_build:
diff --git a/buildspec.yml b/buildspec.yml
index 6394753b0e7..c5cc8b73bb1 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -2,16 +2,12 @@ version: 0.2
 
 phases:
   install:
+    runtime-versions:
+      java: openjdk8
     commands:
       - sed -i 's#/archive.ubuntu.com#/us-east-1.ec2.archive.ubuntu.com#g' /etc/apt/sources.list
-      - add-apt-repository ppa:ubuntu-toolchain-r/test -y
-      - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA9EF27F
-      - add-apt-repository ppa:openjdk-r/ppa -y
       - apt-get update -y
-      - apt-get install -y g++-5 flex bison make git libwww-perl patch ccache libc6-dev-i386 jq gdb
-      - apt-get install -y openjdk-8-jdk
-      - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
-      - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
+      - apt-get install -y flex bison make git libwww-perl patch ccache libc6-dev-i386 jq gdb
   build:
     commands:
       - echo Build started on `date`