diff --git a/android-ndk-r17/Dockerfile b/android-ndk-r17/Dockerfile
index f77ca53..8a98d46 100644
--- a/android-ndk-r17/Dockerfile
+++ b/android-ndk-r17/Dockerfile
@@ -3,6 +3,7 @@ FROM mbgl/${REV}:java
 
 ENV ANDROID_NDK_HOME=/android/sdk/ndk-bundle \
     ANDROID_HOME=/android/sdk \
+    PATH="/flutter/sdk/flutter/bin:${PATH}" \
     GRADLE_OPTS=-Dorg.gradle.daemon=false
 
 # --------------------------------------------------------------------------------------------------
@@ -48,4 +49,16 @@ RUN set -eu \
         "cmake;3.6.4111459" \
  && rm -rf "${ANDROID_HOME}/licenses"
 
+# --------------------------------------------------------------------------------------------------
+# Install Flutter SDK
+
+WORKDIR /flutter/sdk
+
+# Use most recent version from https://flutter.io/setup-linux/
+
+RUN set -eu \
+ && curl -L --retry 3 https://storage.googleapis.com/flutter_infra/releases/beta/linux/flutter_linux_v0.4.4-beta.tar.xz -o flutter.tar.xz \
+ && tar xf flutter.tar.xz && rm flutter.tar.xz
+
+
 WORKDIR /src
diff --git a/base/Dockerfile b/base/Dockerfile
index 97686dc..6a5dff9 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -13,7 +13,7 @@ RUN set -eu \
 
 RUN set -eu \
  && apt-get update \
- && apt-get -y install git make curl zip unzip nodejs ccache python locales \
+ && apt-get -y install git make curl zip unzip xz-utils nodejs ccache python locales \
  && rm -rf /var/lib/apt/lists/*
 
 # Install PIP
diff --git a/java/Dockerfile b/java/Dockerfile
index beb3a00..6e51175 100644
--- a/java/Dockerfile
+++ b/java/Dockerfile
@@ -1,6 +1,8 @@
 ARG REV=latest
 FROM mbgl/${REV}:base
 
+ENV JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
+
 # --------------------------------------------------------------------------------------------------
 # Install system packages