diff --git a/.github/workflows/build_aarch32.yml b/.github/workflows/build_aarch32.yml
index 268ea6f..a81aef6 100644
--- a/.github/workflows/build_aarch32.yml
+++ b/.github/workflows/build_aarch32.yml
@@ -21,4 +21,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         # name: jre
-        path: jre*.tar.xz
+        path: *.tar.xz
diff --git a/.github/workflows/build_aarch64.yml b/.github/workflows/build_aarch64.yml
index d768815..1e5aede 100644
--- a/.github/workflows/build_aarch64.yml
+++ b/.github/workflows/build_aarch64.yml
@@ -21,4 +21,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         # name: jre
-        path: jre*.tar.xz
+        path: *.tar.xz
diff --git a/.github/workflows/build_x86.yml b/.github/workflows/build_x86.yml
index 1af0187..3421a5b 100644
--- a/.github/workflows/build_x86.yml
+++ b/.github/workflows/build_x86.yml
@@ -21,4 +21,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         # name: jre
-        path: jre*.tar.xz
+        path: *.tar.xz
diff --git a/.github/workflows/build_x86_64.yml b/.github/workflows/build_x86_64.yml
index c32cd9b..2903b5a 100644
--- a/.github/workflows/build_x86_64.yml
+++ b/.github/workflows/build_x86_64.yml
@@ -21,4 +21,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         # name: jre
-        path: jre*.tar.xz
+        path: *.tar.xz
diff --git a/removejdkdebuginfo.sh b/removejdkdebuginfo.sh
index ee1affa..9a9d29b 100755
--- a/removejdkdebuginfo.sh
+++ b/removejdkdebuginfo.sh
@@ -8,6 +8,7 @@ then
 fi
 
 cp -r openjdk/build/linux-${TARGET_JDK}-normal-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}/images/j2re-image jreout
+cp -r openjdk/build/linux-${TARGET_JDK}-normal-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}/images/j2sdk-image jdkout
 mv jreout/lib/${TARGET_JDK}/libfreetype.so.6 jreout/lib/${TARGET_JDK}/libfreetype.so || echo "Move exit $?"
 
 # mv jreout/lib/${TARGET_JDK}/libfontmanager.diz jreout/lib/${TARGET_JDK}/libfontmanager.diz.keep
@@ -15,3 +16,4 @@ mv jreout/lib/${TARGET_JDK}/libfreetype.so.6 jreout/lib/${TARGET_JDK}/libfreetyp
 # mv jreout/lib/${TARGET_JDK}/libfontmanager.diz.keep jreout/lib/${TARGET_JDK}/libfontmanager.diz
 
 find jreout -name "libjvm.diz" | xargs -- rm
+find jdkout -name "*.diz" | xargs -- rm
diff --git a/tarjdk.sh b/tarjdk.sh
index 4b39cf0..5098383 100755
--- a/tarjdk.sh
+++ b/tarjdk.sh
@@ -3,3 +3,6 @@ set -e
 mv jre_override/lib/* jreout/lib/
 cd jreout
 tar cJf ../jre8-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .
+cd ../jdkout
+tar cJf ../jdk8-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .
+