diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cb18b33d6..c3c0aca4f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -29,8 +29,8 @@ plugins {
 android {
     defaultConfig {
         applicationId = "com.google.samples.apps.nowinandroid"
-        versionCode = 5
-        versionName = "0.0.5" // X.Y.Z; X = Major, Y = minor, Z = Patch level
+        versionCode = 7
+        versionName = "0.1.1" // X.Y.Z; X = Major, Y = minor, Z = Patch level
 
         // Custom test runner to set up Hilt dependency graph
         testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
diff --git a/build_android_release.sh b/build_android_release.sh
index c7e5fc835..3817d4cda 100755
--- a/build_android_release.sh
+++ b/build_android_release.sh
@@ -21,7 +21,7 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 APP_OUT=$DIR/app/build/outputs
 
-export JAVA_HOME="$(cd $DIR/../../../prebuilts/studio/jdk/jdk11/linux && pwd )"
+export JAVA_HOME="$(cd $DIR/../nowinandroid-prebuilts/jdk17/linux && pwd )"
 echo "JAVA_HOME=$JAVA_HOME"
 
 export ANDROID_HOME="$(cd $DIR/../../../prebuilts/fullsdk/linux && pwd )"
diff --git a/kokoro/build.sh b/kokoro/build.sh
index c217e995c..456752516 100755
--- a/kokoro/build.sh
+++ b/kokoro/build.sh
@@ -36,7 +36,10 @@ echo y | ${ANDROID_HOME}/tools/bin/sdkmanager --licenses
 cd $KOKORO_ARTIFACTS_DIR/git/nowinandroid
 
 # The build needs Java 17, set it as the default Java version.
-sudo update-java-alternatives --set java-1.17.0-openjdk-amd64
+sudo apt-get update
+sudo apt-get install -y openjdk-17-jdk
+sudo update-alternatives --set java /usr/lib/jvm/java-17-openjdk-amd64/bin/java
+java -version
 
 # Also clear JAVA_HOME variable so java -version is used instead
 export JAVA_HOME=
diff --git a/kokoro/nightly.sh b/kokoro/nightly.sh
index 94946020e..1423f4f44 100755
--- a/kokoro/nightly.sh
+++ b/kokoro/nightly.sh
@@ -21,12 +21,11 @@ set -e
 set -x
 
 # Run the normal build, but replace the default virtual devices with physical ones.
-# hammerhead  | Nexus 5       | API 23 | Phone
 # walleye     | Pixel 2       | API 27 | Phone
 # gts4lltevzw | Galaxy Tab S4 | API 28 | Tablet
 # a10         | Samsung A10   | API 29 | Phone
 # redfin      | Pixel 5e      | API 30 | Phone
 # oriole      | Pixel 6       | API 31 | Phone
-bash $KOKORO_ARTIFACTS_DIR/git/nowinandroid/kokoro/build.sh "hammerhead,walleye,gts4lltevzw,a10,redfin,oriole" "23,27,28,29,30,31"
+bash $KOKORO_ARTIFACTS_DIR/git/nowinandroid/kokoro/build.sh "walleye,gts4lltevzw,a10,redfin,oriole" "27,28,29,30,31"
 
 exit $?