diff --git a/pkgbuilds/stable/limine-mkinitcpio-hook/PKGBUILD b/pkgbuilds/stable/limine-mkinitcpio-hook/PKGBUILD
index cd693e4..0b60ed0 100644
--- a/pkgbuilds/stable/limine-mkinitcpio-hook/PKGBUILD
+++ b/pkgbuilds/stable/limine-mkinitcpio-hook/PKGBUILD
@@ -1,19 +1,20 @@
 # Maintainer: Zesko
 _pkgname="limine-entry-tool"
 pkgname="limine-mkinitcpio-hook"
-pkgver=1.29.0
+_pkgver=1.30.0
+_extver="" #_extver="_1"
+pkgver="${_pkgver}${_extver}"
 pkgrel=2
-_extver="-${pkgrel}"
 pkgdesc="Install kernels for the Limine bootloader."
 arch=('x86_64' 'aarch64')
 url="https://gitlab.com/Zesko/limine-entry-tool"
-source=("$url/-/archive/${pkgver}${_extver}/$_pkgname-${pkgver}${_extver}.tar.gz")
+source=("${_pkgname}::git+${url}.git#tag=${pkgver}")
 source_x86_64=("https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.2/graalvm-community-jdk-25.0.2_linux-x64_bin.tar.gz")
 source_aarch64=("https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.2/graalvm-community-jdk-25.0.2_linux-aarch64_bin.tar.gz")
 license=("GPL3")
 provides=('limine-entry-tool')
 options=(!debug !strip)
-_graalvm_version=java-25-graalvm-ce
+_graalvm_version=graalvm_ce_jdk25
 depends=(
 	'bash'
 	'grep'
@@ -29,7 +30,7 @@ optdepends=(
 makedepends=('git' 'gradle')
 backup=(etc/limine-entry-tool.conf)
 conflicts=('limine-entry-tool')
-sha256sums=('03e041631aa1275f0a03ecae0ada6f1bb3fa69e5b428e5b68f7240da68b6b4f4')
+sha256sums=('0f00cafc78776e64aa69f6e7c0149f59b06e5faf10cc1f7a22484675578964c5')
 sha256sums_x86_64=('e0be791c8fda4d03b6b0a0cb824fef3149736170057b3a515252b44419606af0')
 sha256sums_aarch64=('b4580d9f223d0a4b3a1757e58b18ff4c1db950e67e105fc5cb741457d2384a71')
 
@@ -43,13 +44,15 @@ prepare() {
 }
 
 build() {
-	cd "$srcdir/${_pkgname}-${pkgver}${_extver}"
+	cd "$srcdir/${_pkgname}"
+	export GRAALVM_HOME="$srcdir/${_graalvm_version}"
+	export JAVA_HOME="${GRAALVM_HOME}"
 	export NATIVE_IMAGE_OPTIONS="-march=compatibility"
-	JAVA_HOME="$srcdir/${_graalvm_version}" gradle clean nativeCompile
+	/usr/bin/gradle clean nativeCompile -Dorg.gradle.java.home="${JAVA_HOME}"
 }
 
 package() {
-	cd "$srcdir/${_pkgname}-${pkgver}${_extver}"
+	cd "$srcdir/${_pkgname}"
 	src_path="install/arch-linux/${pkgname}"
 	install -dm 755 "$src_path/usr/share/limine-entry-tool.d/"
 	install -dm 755 "$src_path/etc/limine-entry-tool.d/"
diff --git a/pkgbuilds/stable/limine-mkinitcpio-hook/patches/add-exports-and-bump-pkgrel.patch b/pkgbuilds/stable/limine-mkinitcpio-hook/patches/add-exports-and-bump-pkgrel.patch
index e0726d9..69db299 100644
--- a/pkgbuilds/stable/limine-mkinitcpio-hook/patches/add-exports-and-bump-pkgrel.patch
+++ b/pkgbuilds/stable/limine-mkinitcpio-hook/patches/add-exports-and-bump-pkgrel.patch
@@ -1,21 +1,31 @@
-diff --git i/pkgbuilds/stable/limine-mkinitcpio-hook/PKGBUILD w/pkgbuilds/stable/limine-mkinitcpio-hook/PKGBUILD
-index 4758820..cd693e4 100644
---- i/pkgbuilds/stable/limine-mkinitcpio-hook/PKGBUILD
-+++ w/pkgbuilds/stable/limine-mkinitcpio-hook/PKGBUILD
-@@ -2,7 +2,7 @@
- _pkgname="limine-entry-tool"
- pkgname="limine-mkinitcpio-hook"
- pkgver=1.29.0
+diff --git i/pkgbuilds/edge/limine-mkinitcpio-hook/.gitignore w/pkgbuilds/edge/limine-mkinitcpio-hook/.gitignore
+index 1d65adf..acefa93 100644
+--- i/pkgbuilds/edge/limine-mkinitcpio-hook/.gitignore
++++ w/pkgbuilds/edge/limine-mkinitcpio-hook/.gitignore
+@@ -1,3 +1,5 @@
+ *
+ !PKGBUILD
+ !.SRCINFO
++!patches/
++!patches/**
+diff --git i/pkgbuilds/edge/limine-mkinitcpio-hook/PKGBUILD w/pkgbuilds/edge/limine-mkinitcpio-hook/PKGBUILD
+index 500b190..0b60ed0 100644
+--- i/pkgbuilds/edge/limine-mkinitcpio-hook/PKGBUILD
++++ w/pkgbuilds/edge/limine-mkinitcpio-hook/PKGBUILD
+@@ -4,7 +4,7 @@ pkgname="limine-mkinitcpio-hook"
+ _pkgver=1.30.0
+ _extver="" #_extver="_1"
+ pkgver="${_pkgver}${_extver}"
 -pkgrel=1
 +pkgrel=2
- _extver="-${pkgrel}"
  pkgdesc="Install kernels for the Limine bootloader."
  arch=('x86_64' 'aarch64')
-@@ -44,6 +44,7 @@ prepare() {
- 
- build() {
- 	cd "$srcdir/${_pkgname}-${pkgver}${_extver}"
+ url="https://gitlab.com/Zesko/limine-entry-tool"
+@@ -47,6 +47,7 @@ build() {
+ 	cd "$srcdir/${_pkgname}"
+ 	export GRAALVM_HOME="$srcdir/${_graalvm_version}"
+ 	export JAVA_HOME="${GRAALVM_HOME}"
 +	export NATIVE_IMAGE_OPTIONS="-march=compatibility"
- 	JAVA_HOME="$srcdir/${_graalvm_version}" gradle clean nativeCompile
+ 	/usr/bin/gradle clean nativeCompile -Dorg.gradle.java.home="${JAVA_HOME}"
  }