@@ -30,12 +30,10 @@ RUN echo '§' && apt-get -qy update
 RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
     apt-get install -qq -y nodejs
 
-#RUN apt-get install -qq -y openjdk-8-jre
-RUN apt-get install -qq -y openjdk-8-jre > /dev/null
+RUN apt-get install -qq -y openjdk-11-jre > /dev/null
 
 ENV PATH /usr/local/go/bin:/go/bin:$PATH
 
-
 # code generation scripts
 COPY *.sh /root/
 RUN chmod +x /root/*.sh
@@ -17,7 +17,7 @@
 # Base images for SDKs Bump: 1
 #
 
-FROM debian:stretch
+FROM debian:buster
 
 RUN apt-get update && apt-get install -y \
   build-essential autoconf libtool git pkg-config curl \
@@ -27,19 +27,20 @@ RUN apt-get update && apt-get install -y \
 ARG GRPC_RELEASE_TAG
 # install protobuf first, then grpc
 RUN git clone -b $GRPC_RELEASE_TAG --depth=5 https://github.com/grpc/grpc /var/local/git/grpc && \
-		cd /var/local/git/grpc && \
+    cd /var/local/git/grpc && \
     git submodule update --init && \
     echo "--- installing protobuf ---" && \
     cd third_party/protobuf && \
     ./autogen.sh && ./configure --enable-shared && \
-    make -j$(nproc) && make install && make clean && ldconfig && \
+    make -j4 && make install && make clean && ldconfig && \
+    export CFLAGS=-Wno-error && export CXXFLAGS=-Wno-error && \
     echo "--- installing grpc ---" && \
     cd /var/local/git/grpc && \
-    make -j$(nproc) && make install && make clean && ldconfig
+    make -j4 && make install && make clean && ldconfig
 
 WORKDIR /go/src/agones.dev/agones
 
 # code generation scripts
 COPY entrypoint.sh /root/
 RUN chmod +x /root/entrypoint.sh
-ENTRYPOINT [ "/root/entrypoint.sh" ]
+ENTRYPOINT [ "/root/entrypoint.sh" ]
@@ -313,7 +313,7 @@ substitutions:
   _RUST_SDK_BUILD_CACHE_KEY: rust-sdk-build
 
 tags: ['ci']
-timeout: "1h"
+timeout: "2h"
 images: ['gcr.io/$PROJECT_ID/agones-controller', 'gcr.io/$PROJECT_ID/agones-sdk', 'gcr.io/$PROJECT_ID/agones-ping']
 logsBucket: "gs://agones-build-logs"
 options: