diff --git a/android/build-publish.sh b/android/build-publish.sh
index 5aea4a867d..5ea6dd9cc4 100755
--- a/android/build-publish.sh
+++ b/android/build-publish.sh
@@ -57,6 +57,12 @@ while [[ $# -gt 0 ]] ; do
   shift # past argument
 done
 
+# Override JAVA_HOME to OpenJDK 11
+if [ -f .build-builder ]; then
+  builder_heading "Setting JAVA_HOME to OpenJDK 11"
+  export JAVA_HOME=${JAVA_HOME_11}
+fi
+
 echo
 echo "NO_DAEMON: $NO_DAEMON"
 echo "DO_KMAPRO: $DO_KMAPRO"
@@ -86,3 +92,9 @@ if [ "$DO_FV" = true ]; then
   cd "$KEYMAN_ROOT/oem/firstvoices/android/"
   ./gradlew $DAEMON_FLAG $BUILD_FLAGS
 fi
+
+# Revert to use default OpenJDK 8
+if [ -f .build-builder ]; then
+  builder_heading "Returning JAVA_HOME to OpenJDK 8"
+  export JAVA_HOME=${JAVA_HOME_8}
+fi