diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full
index 201834cf975ba5cc4660df24897cc68dcdd5a1c8..940a097aa091e282196a07e300ac2219b7bf4744 100644
--- a/scripts/docker/Dockerfile.gcc.full
+++ b/scripts/docker/Dockerfile.gcc.full
@@ -11,16 +11,10 @@ RUN apt-get update -y && \
 
 # GNU compiler
 RUN apt-get update -y && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common && \
-    apt-add-repository ppa:ubuntu-toolchain-r/test -y && \
-    apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        gcc-6 \
-        g++-6 && \
+        gcc \
+        g++ && \
     rm -rf /var/lib/apt/lists/*
-RUN update-alternatives --install /usr/bin/gcc gcc $(which gcc-6) 30 && \
-    update-alternatives --install /usr/bin/g++ g++ $(which g++-6) 30 && \
-    update-alternatives --install /usr/bin/gcov gcov $(which gcov-6) 30
 
 # OGS base building block
 # Python
diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui
index d771ee2d4023cdb98b4af200a7d39932fcecd946..8fe79457500cc042dd19df55959e6fcd859b45d8 100644
--- a/scripts/docker/Dockerfile.gcc.gui
+++ b/scripts/docker/Dockerfile.gcc.gui
@@ -11,16 +11,10 @@ RUN apt-get update -y && \
 
 # GNU compiler
 RUN apt-get update -y && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common && \
-    apt-add-repository ppa:ubuntu-toolchain-r/test -y && \
-    apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        gcc-6 \
-        g++-6 && \
+        gcc \
+        g++ && \
     rm -rf /var/lib/apt/lists/*
-RUN update-alternatives --install /usr/bin/gcc gcc $(which gcc-6) 30 && \
-    update-alternatives --install /usr/bin/g++ g++ $(which g++-6) 30 && \
-    update-alternatives --install /usr/bin/gcov gcov $(which gcov-6) 30
 
 # OGS base building block
 # Python