diff --git a/README.md b/README.md
index 1643fbe..f0d610f 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ Based on http://openjdk.java.net/projects/mobile/android.html
 
 ### Run in this directory:
 ```
+export JDK_DEBUG_LEVEL=[release/fastdebug/debug]
 export NDK_VERSION=r14
 ./extractndk.sh
 ./getlibs.sh
diff --git a/buildjdk.sh b/buildjdk.sh
index e5113ff..b331bc2 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -37,7 +37,7 @@ bash ./configure \
 	--with-jdk-variant=normal \
 	--with-cups-include=$CUPS_DIR \
 	--with-devkit=$ANDROID_DEVKIT \
-	--with-debug-level=release \
+	--with-debug-level=$JDK_DEBUG_LEVEL \
 	--with-fontconfig-include=$ANDROID_INCLUDE \
 	--with-freetype-lib=$FREETYPE_DIR/lib \
 	--with-freetype-include=$FREETYPE_DIR/include/freetype2 \
diff --git a/ci_build_global.sh b/ci_build_global.sh
index 42c5c5a..501752f 100644
--- a/ci_build_global.sh
+++ b/ci_build_global.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+export JDK_DEBUG_LEVEL=fastdebug
+
 . setdevkitpath.sh
 
 wget -nc -nv -O android-ndk-$NDK_VERSION-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip"
diff --git a/removejdkdebuginfo.sh b/removejdkdebuginfo.sh
index 9915517..a183bb6 100755
--- a/removejdkdebuginfo.sh
+++ b/removejdkdebuginfo.sh
@@ -2,5 +2,5 @@
 set -e
 rm -rf jreout || true
 
-cp -r openjdk/build/linux-${TARGET_JDK}-normal-server-release/images/j2re-image jreout
+cp -r openjdk/build/linux-${TARGET_JDK}-normal-server-${JDK_DEBUG_LEVEL}/images/j2re-image jreout
 find jreout -name "*.diz" | xargs -- rm
diff --git a/setdevkitpath.sh b/setdevkitpath.sh
index 12d6ae5..a6a37fe 100644
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -1,6 +1,9 @@
 export NDK_VERSION=r14
 
-# Override GitHub Actions env vars
+if [ -z "$JDK_DEBUG_LEVEL" ]
+then
+  export JDK_DEBUG_LEVEL=release
+fi
 
 if [ "$TARGET_JDK" == "aarch64" ]
 then
@@ -9,6 +12,7 @@ else
   export TARGET_SHORT=$TARGET_JDK
 fi
 
+# Override GitHub Actions env var
 export NDK_HOME=`pwd`/android-ndk-$NDK_VERSION
 
 export NDK=$NDK_HOME
diff --git a/tarjdk.sh b/tarjdk.sh
index fb7bc5f..6d9ca0e 100755
--- a/tarjdk.sh
+++ b/tarjdk.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -e
 cd jreout
-tar cJf ../jre8-${TARGET_SHORT}-`date +%Y%m%d`.tar.xz .
+tar cJf ../jre8-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .