diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 7b60f3e6e..6e74a6793 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -5,12 +5,14 @@
 # Inspired by:
 # https://hub.docker.com/r/runmymind/docker-android-sdk/~/dockerfile/
 
-FROM ubuntu:17.10
+FROM ubuntu:18.04
 
 MAINTAINER Randall Barker "rbarker@mozilla.com"
 
 # -- System -----------------------------------------------------------------------------
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update -qq
 
 RUN apt-get install -y openjdk-8-jdk \
@@ -33,19 +35,19 @@ RUN locale-gen en_US.UTF-8
 
 # -- Android SDK ------------------------------------------------------------------------
 
-RUN cd /opt && wget -q https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip -O android-sdk.zip
+RUN cd /opt && wget -q https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip -O android-sdk.zip
 RUN cd /opt && unzip android-sdk.zip
 RUN cd /opt && rm -f android-sdk.zip
 
-ENV ANDROID_BUILD_TOOLS_VERSION "28.0.3"
+ENV ANDROID_BUILD_TOOLS_VERSION_29 "29.0.2"
 ENV ANDROID_SDK_HOME /opt
 ENV ANDROID_HOME /opt
-ENV PATH ${PATH}:${ANDROID_SDK_HOME}/tools/bin:${ANDROID_SDK_HOME}/platform-tools:/opt/tools:${ANDROID_SDK_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}
+ENV PATH ${PATH}:${ANDROID_SDK_HOME}/tools/bin:${ANDROID_SDK_HOME}/platform-tools:/opt/tools:${ANDROID_SDK_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION_29}
 
-RUN echo y | sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}"
-RUN echo y | sdkmanager "ndk-bundle"
-RUN echo y | sdkmanager "cmake;3.10.2.4988404"
-RUN echo y | sdkmanager "platforms;android-28"
+RUN echo y | sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION_29}" --sdk_root=$ANDROID_SDK_HOME
+RUN echo y | sdkmanager "ndk-bundle" --sdk_root=$ANDROID_SDK_HOME
+RUN echo y | sdkmanager "cmake;3.10.2.4988404" --sdk_root=$ANDROID_SDK_HOME
+RUN echo y | sdkmanager "platforms;android-29" --sdk_root=$ANDROID_SDK_HOME
 
 WORKDIR /opt
 
@@ -54,10 +56,16 @@ RUN git clone https://github.com/MozillaReality/FirefoxReality.git
 
 # Build project and run gradle tasks once to pull all dependencies
 WORKDIR /opt/FirefoxReality
+RUN git config --global user.email "noreply@mozilla.com"
+RUN git config --global user.name "No Reply"
+RUN echo sdk.dir=/opt > local.properties && echo ndk.dir=/opt/ndk-bundle >> local.properties
+RUN git checkout -b update origin/gradle
+RUN git rebase origin/master
 RUN git submodule init
 RUN git submodule update
 RUN ./gradlew --no-daemon assembleNoapi
 RUN ./gradlew --no-daemon clean
+RUN git checkout master
 
 # -- Cleanup ----------------------------------------------------------------------------