diff --git a/packages/addons/addon-depends/jre-depends/apache-ant/package.mk b/packages/addons/addon-depends/jre-depends/apache-ant/package.mk
index 68c7210960..1a258eab69 100644
--- a/packages/addons/addon-depends/jre-depends/apache-ant/package.mk
+++ b/packages/addons/addon-depends/jre-depends/apache-ant/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="de0a860bf339e6975558f426772a6aa2c6ae0856215dd9aaf57aa2476d665664"
 PKG_LICENSE="Apache License 2.0"
 PKG_SITE="https://ant.apache.org/"
 PKG_URL="https://archive.apache.org/dist/ant/binaries/${PKG_NAME}-${PKG_VERSION}-bin.tar.xz"
-PKG_DEPENDS_UNPACK="jdk-x86_64-zulu"
+PKG_DEPENDS_UNPACK="jdk-${MACHINE_HARDWARE_NAME}-zulu"
 PKG_LONGDESC="Apache Ant is a Java library and command-line tool that help building software."
 PKG_TOOLCHAIN="manual"
 
diff --git a/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk b/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk
index 5a256b88fd..6f50638b0b 100644
--- a/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk
+++ b/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk
@@ -7,7 +7,7 @@ PKG_NAME="jre-libbluray"
 PKG_DEPENDS_TARGET+=" apache-ant:host"
 PKG_LONGDESC="libbluray jar for BD-J menus"
 PKG_URL=""
-PKG_DEPENDS_UNPACK+=" jdk-x86_64-zulu libbluray"
+PKG_DEPENDS_UNPACK+=" jdk-${MACHINE_HARDWARE_NAME}-zulu libbluray"
 PKG_PATCH_DIRS+=" $(get_pkg_directory libbluray)/patches"
 PKG_BUILD_FLAGS="-sysroot"
 
@@ -17,7 +17,7 @@ unpack() {
 }
 
 pre_configure_target() {
-  export JAVA_HOME="$(get_build_dir jdk-x86_64-zulu)"
+  export JAVA_HOME="$(get_build_dir jdk-${MACHINE_HARDWARE_NAME}-zulu)"
 
   # build also jar
   PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET/disable-bdjava-jar/enable-bdjava-jar}"