diff --git a/pkgbuilds/edge/yay/pkgrel.override b/pkgbuilds/edge/yay/pkgrel.override
deleted file mode 100644
index e7cbec2f..00000000
--- a/pkgbuilds/edge/yay/pkgrel.override
+++ /dev/null
@@ -1,3 +0,0 @@
-# Format: pkgver=pkgrel
-# Applied after AUR sync when pkgver matches. Auto-removed when stale.
-12.5.7=2
diff --git a/pkgbuilds/edge/yay/.SRCINFO b/pkgbuilds/yay/.SRCINFO
similarity index 97%
rename from pkgbuilds/edge/yay/.SRCINFO
rename to pkgbuilds/yay/.SRCINFO
index 5698489a..784d1d2b 100644
--- a/pkgbuilds/edge/yay/.SRCINFO
+++ b/pkgbuilds/yay/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = yay
 	pkgdesc = Yet another yogurt. Pacman wrapper and AUR helper written in go.
 	pkgver = 12.5.7
-	pkgrel = 2
+	pkgrel = 2.1
 	url = https://github.com/Jguer/yay
 	arch = i686
 	arch = pentium4
diff --git a/pkgbuilds/edge/yay/.gitignore b/pkgbuilds/yay/.gitignore
similarity index 65%
rename from pkgbuilds/edge/yay/.gitignore
rename to pkgbuilds/yay/.gitignore
index e4793d7c..bfca992b 100644
--- a/pkgbuilds/edge/yay/.gitignore
+++ b/pkgbuilds/yay/.gitignore
@@ -4,4 +4,5 @@
 /pkg
 /src
 /yay
-!pkgrel.override
+!.omarchy/
+!.omarchy/**
diff --git a/pkgbuilds/yay/.omarchy/package.json b/pkgbuilds/yay/.omarchy/package.json
index 08613868..01e49422 100644
--- a/pkgbuilds/yay/.omarchy/package.json
+++ b/pkgbuilds/yay/.omarchy/package.json
@@ -1,3 +1,7 @@
 {
-  "source": "aur"
+  "source": "aur",
+  "pkgrel": {
+    "suffix": 1,
+    "offset": 1
+  }
 }
diff --git a/pkgbuilds/yay/.omarchy/pkgrel.override b/pkgbuilds/yay/.omarchy/pkgrel.override
deleted file mode 100644
index e7cbec2f..00000000
--- a/pkgbuilds/yay/.omarchy/pkgrel.override
+++ /dev/null
@@ -1,3 +0,0 @@
-# Format: pkgver=pkgrel
-# Applied after AUR sync when pkgver matches. Auto-removed when stale.
-12.5.7=2
diff --git a/pkgbuilds/edge/yay/PKGBUILD b/pkgbuilds/yay/PKGBUILD
similarity index 98%
rename from pkgbuilds/edge/yay/PKGBUILD
rename to pkgbuilds/yay/PKGBUILD
index a11b0319..31a51772 100644
--- a/pkgbuilds/edge/yay/PKGBUILD
+++ b/pkgbuilds/yay/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jguer <pkgbuilds at jguer.space>
 pkgname=yay
 pkgver=12.5.7
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Yet another yogurt. Pacman wrapper and AUR helper written in go."
 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64' 'riscv64')
 url="https://github.com/Jguer/yay"