diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2d7d05e..bdb0b93 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: "jdk8-${{matrix.arch}}"
-        path: jdk8*.tar.xz
+        path: jdk8-android*.tar.xz
 
     - name: Setup tmate session if failed
       if: ${{ failure() }}
@@ -44,7 +44,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: 'jre8-${{matrix.arch}}'
-        path: jre8*.tar.xz
+        path: jre8-android*.tar.xz
     - name: Upload JRE debuginfo build output
       uses: actions/upload-artifact@v4
       with:
@@ -71,13 +71,13 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: "jdk8-ios-aarch64"
-        path: jdk8*.tar.xz
+        path: jdk8-ios*.tar.xz
 
     - name: Upload JRE build output
       uses: actions/upload-artifact@v4
       with:
         name: 'jre8-ios-aarch64'
-        path: jre8*.tar.xz
+        path: jre8-ios*.tar.xz
 
     - name: Upload JRE debuginfo build output
       uses: actions/upload-artifact@v4
diff --git a/setdevkitpath.sh b/setdevkitpath.sh
index 6a50f7f..50f0ab0 100755
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -50,6 +50,8 @@ if [[ "$BUILD_IOS" == "1" ]]; then
   export HOTSPOT_DISABLE_DTRACE_PROBES=1
 
   export ANDROID_INCLUDE=$PWD/ios-missing-include
+  
+  export TARGET_OS=ios
 else
 
 export JVM_PLATFORM=linux
@@ -76,4 +78,6 @@ export LD=$TOOLCHAIN/bin/$TARGET-ld
 export OBJCOPY=$TOOLCHAIN/bin/$TARGET-objcopy
 export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib
 export STRIP=$TOOLCHAIN/bin/$TARGET-strip
+
+export TARGET_OS=android
 fi
diff --git a/tarjdk.sh b/tarjdk.sh
index 211b2fb..f1d5514 100755
--- a/tarjdk.sh
+++ b/tarjdk.sh
@@ -34,8 +34,8 @@ cd jreout
 # Strip in place all .so files thanks to the ndk
 find ./ -name '*.so' -execdir ${NDK}${NDK_PREBUILT_ARCH} {} \;
 
-tar cJf ../jre8-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .
+tar cJf ../jre8-${TARGET_OS}-${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 .
+tar cJf ../jdk8-${TARGET_OS}-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .