diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
index 055668a9f..b2524e679 100644
--- a/ansible/roles/baselayout/vars/main.yml
+++ b/ansible/roles/baselayout/vars/main.yml
@@ -144,14 +144,20 @@ packages: {
   ],
 
   ubuntu: [
-    'ccache,g++,gcc,g++-6,gcc-6,git,libfontconfig1,sudo,python3-pip',
+    'ccache,git,libfontconfig1,sudo,python3-pip',
   ],
 
   ubuntu1404: [
     'ntp,gcc-8,g++-8,gcc-6,g++-6,g++-4.8,gcc-4.8,g++-4.9,gcc-4.9,binutils-2.26',
   ],
 
+  # Default gcc/g++ package is 5.
   ubuntu1604: [
-    'python3.9,python3.9-distutils',
+    'gcc-8,g++-6,gcc-6,g++-6,python3.9,python3.9-distutils',
+  ],
+
+  # Default gcc/g++ package is 7.
+  ubuntu1804: [
+    'gcc-6,g++-6,gcc-8,g++-8',
   ],
 }
diff --git a/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2
index c58c89bfe..badbf33b6 100644
--- a/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2
@@ -15,8 +15,10 @@ ENV ARCH x64
 
 RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
     ccache \
-    g++ \
-    gcc \
+    g++-6 \
+    gcc-6 \
+    g++-8 \
+    gcc-8 \
     git \
     openjdk-8-jre-headless \
     curl \
diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
index 4942371a1..0d61bf57c 100644
--- a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
@@ -17,8 +17,10 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install apt-utils -y && \
     apt-get dist-upgrade -y && apt-get install -y \
       ccache \
-      g++ \
-      gcc \
+      g++-6 \
+      gcc-6 \
+      g++-8 \
+      gcc-8 \
       git \
       openjdk-8-jre-headless \
       curl \
diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh
index 1623b4549..b90cd3339 100644
--- a/jenkins/scripts/select-compiler.sh
+++ b/jenkins/scripts/select-compiler.sh
@@ -162,6 +162,18 @@ elif [ "$SELECT_ARCH" = "X64" ]; then
         echo "Compiler set to GCC 6 for $NODEJS_MAJOR_VERSION"
       fi
       ;;
+    *ubuntu1804*64 )
+      if [ "$NODEJS_MAJOR_VERSION" -gt "15" ]; then
+        export CC="ccache gcc-8"
+        export CXX="ccache g++-8"
+        export LINK="g++-8"
+      else
+        export CC="ccache gcc-6"
+        export CXX="ccache g++-6"
+        export LINK="g++-6"
+      fi
+      echo "Compiler set to GCC" `$CXX -dumpversion`
+      ;;
   esac
 
 elif [ "$SELECT_ARCH" = "ARM64" ]; then