diff --git a/testing/apmpkg/APKBUILD b/testing/apmpkg/APKBUILD
index 4e1da505fbd58a96073405e4b68ca4aac3b2ed26..734d0214c8e95392fd935052ef5c48b7cd026c94 100644
--- a/testing/apmpkg/APKBUILD
+++ b/testing/apmpkg/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: kedap <kedap.dev@protonmail.com>
 pkgname=apmpkg
 pkgver=1.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A Package Manager as a model: PKGBUILD"
 url="https://github.com/kedap/apmpkg"
 # armhf: test timeout
@@ -49,7 +49,7 @@ package() {
 
 	#Install fish completion
 	install -Dm0644 completions/$pkgname.fish \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 }
 
 sha512sums="
diff --git a/testing/atlas/APKBUILD b/testing/atlas/APKBUILD
index 952e008e43b4e99bf26ed7827403bced77ae20c5..7a2df992d67f5f979642ab7a1c6a03fd63e01752 100644
--- a/testing/atlas/APKBUILD
+++ b/testing/atlas/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=atlas
 pkgver=0.11.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Database schema migration tool using modern DevOps principles"
 url="https://atlasgo.io/"
 # github.com/auxten/postgresql-parser fails to build on 32-bit platforms
@@ -42,7 +42,7 @@ package() {
 	install -Dm644 atlas.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/atlas
 	install -Dm644 atlas.fish \
-		"$pkgdir"/usr/share/fish/completions/atlas.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/atlas.fish
 	install -Dm644 atlas.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_atlas
 }
diff --git a/testing/buf/APKBUILD b/testing/buf/APKBUILD
index cd5d0447f20715cef6883ef8835478a09c74ba25..37b5ba4be8c40ded9a30b124d55dd4a926b642da 100644
--- a/testing/buf/APKBUILD
+++ b/testing/buf/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=buf
 pkgver=1.19.0
-pkgrel=0
+pkgrel=1
 pkgdesc="CLI to work with Protocol Buffers"
 url="https://buf.build/"
 # 32bit: fail tests with int overflow
@@ -49,7 +49,7 @@ package() {
 	install -Dm644 buf.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/buf
 	install -Dm644 buf.fish \
-		"$pkgdir"/usr/share/fish/completions/buf.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/buf.fish
 	install -Dm644 buf.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_buf
 
diff --git a/testing/cilium-cli/APKBUILD b/testing/cilium-cli/APKBUILD
index 87a63d62b13e186d6e882c463d38d402001ba6a9..4627dc429527e0229b349bad92c04e187665118b 100644
--- a/testing/cilium-cli/APKBUILD
+++ b/testing/cilium-cli/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=cilium-cli
 pkgver=0.14.3
-pkgrel=0
+pkgrel=1
 pkgdesc="CLI to install, manage and troubleshoot Kubernetes clusters running Cilium"
 url="https://cilium.io/"
 arch="all"
@@ -39,7 +39,7 @@ package() {
 	install -Dm644 cilium.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/cilium
 	install -Dm644 cilium.fish \
-		"$pkgdir"/usr/share/fish/completions/cilium.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/cilium.fish
 	install -Dm644 cilium.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_cilium
 }
diff --git a/testing/cue-cli/APKBUILD b/testing/cue-cli/APKBUILD
index 5e446f2506cb18a8c617b22013ec7b17f5f5284b..820ff1b674a16b3406ec0ec698f1b6508d9d4ace 100644
--- a/testing/cue-cli/APKBUILD
+++ b/testing/cue-cli/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=cue-cli
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="CLI for CUE configuration and validation language"
 url="https://cuelang.org/"
 # 32-bit: value out of int range
@@ -40,7 +40,7 @@ package() {
 	install -Dm644 cue.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/cue
 	install -Dm644 cue.fish \
-		"$pkgdir"/usr/share/fish/completions/cue.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/cue.fish
 	install -Dm644 cue.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_cue
 }
diff --git a/testing/dapr-cli/APKBUILD b/testing/dapr-cli/APKBUILD
index 865dfaaca68ac81a86c5788fed00b5d360efc861..b3fcdf688ba7d11b52679db56a14371fc5e84f4e 100644
--- a/testing/dapr-cli/APKBUILD
+++ b/testing/dapr-cli/APKBUILD
@@ -3,7 +3,7 @@ pkgname=dapr-cli
 pkgver=1.11.0
 # API version described in https://docs.dapr.io/reference/api/
 _runtimever=1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="CLI tool for Dapr the portable, event-driven runtime to build distributed applications"
 url="https://dapr.io/"
 # 32-bit: not useful
@@ -46,7 +46,7 @@ package() {
 	install -Dm644 dapr.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/dapr
 	install -Dm644 dapr.fish \
-		"$pkgdir"/usr/share/fish/completions/dapr.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/dapr.fish
 	install -Dm644 dapr.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_dapr
 }
diff --git a/testing/ddgr/APKBUILD b/testing/ddgr/APKBUILD
index 1f80f5a017b159d581d8d2149e6414be361ef9a3..ab295c5a505b567184f5b343d1fae39a5194d970 100644
--- a/testing/ddgr/APKBUILD
+++ b/testing/ddgr/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: dai9ah <dai9ah@protonmail.com>
 pkgname=ddgr
 pkgver=2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="DuckDuckGo from the terminal"
 url="https://github.com/jarun/ddgr"
 arch="noarch"
@@ -22,7 +22,7 @@ package() {
 	install -Dm644 "$builddir"/auto-completion/bash/* \
 		-t "$pkgdir"/usr/share/bash-completion/completions/
 	install -Dm644 "$builddir"/auto-completion/fish/* \
-		-t "$pkgdir"/usr/share/fish/completions/
+		-t "$pkgdir"/usr/share/fish/vendor_completions.d/
 	install -Dm644 "$builddir"/auto-completion/zsh/* \
 		-t "$pkgdir"/usr/share/zsh/site-functions/
 }
diff --git a/testing/driftctl/APKBUILD b/testing/driftctl/APKBUILD
index 1eb08bd5f9a6770114a03f5109257ea0d6694228..35cc4e4aa0c8e0da65fbf8fefb3ce8cd45603cf1 100644
--- a/testing/driftctl/APKBUILD
+++ b/testing/driftctl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=driftctl
 pkgver=0.39.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Measure infrastructure as code coverage, and track infrastructure drift"
 url="https://driftctl.com/"
 # 32bit: fail tests
@@ -46,7 +46,7 @@ package() {
 	install -Dm644 driftctl.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/driftctl
 	install -Dm644 driftctl.fish \
-		"$pkgdir"/usr/share/fish/completions/driftctl.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/driftctl.fish
 	install -Dm644 driftctl.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_driftctl
 }
diff --git a/testing/elektra/APKBUILD b/testing/elektra/APKBUILD
index e34cec6af55c4f74a4b195480a59ecbaee8fe977..31da86cc3bc841c3c2b09cfdd7469d30e5944525 100644
--- a/testing/elektra/APKBUILD
+++ b/testing/elektra/APKBUILD
@@ -6,7 +6,7 @@
 pkgname=elektra
 _pkgname=libelektra
 pkgver=0.8.21
-pkgrel=21
+pkgrel=22
 pkgdesc="A universal and secure framework to access configuration parameters"
 url="https://www.libelektra.org"
 #arch="all !armhf" # armhf blocked by qt5-qtdeclarative
@@ -289,7 +289,7 @@ fishcomp() {
 	depends=""
 	install_if="$pkgname=$pkgver-r$pkgrel fish"
 
-	_submv usr/share/fish/vendor_completions.d usr/share/fish/completions
+	_submv usr/share/fish/vendor_completions.d usr/share/fish/vendor_completions.d
 }
 
 zshcomp() {
diff --git a/testing/exaile/APKBUILD b/testing/exaile/APKBUILD
index 7e9568a055bd62d24a22c020d3eed73552c1e1c1..a222325862dfffc7e778e18e1bd1e846de4a47ba 100644
--- a/testing/exaile/APKBUILD
+++ b/testing/exaile/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: psykose <alice@ayaya.dev>
 pkgname=exaile
 pkgver=4.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Music Player for GTK+"
 url="https://exaile.org/"
 # s390x: fails tests
@@ -45,7 +45,7 @@ check() {
 }
 
 package() {
-	make PREFIX=/usr DESTDIR="$pkgdir" FISHCOMPDIR="/usr/share/fish/completions" install
+	make PREFIX=/usr DESTDIR="$pkgdir" FISHCOMPDIR="/usr/share/fish/vendor_completions.d" install
 }
 
 sha512sums="
diff --git a/testing/exercism/APKBUILD b/testing/exercism/APKBUILD
index a3269984d5c528c1f926576399ff6fca0d7c3600..07fecfed4deb8d7146351db3756cabb71fdb59b0 100644
--- a/testing/exercism/APKBUILD
+++ b/testing/exercism/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Dmitry Zakharchenko <dmitz@disroot.org>
 pkgname=exercism
 pkgver=3.1.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Command-line client for exercism.io"
 url="https://github.com/exercism/cli"
 arch="all"
@@ -39,7 +39,7 @@ package() {
 	install -Dm644 shell/exercism_completion.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 	install -Dm644 shell/exercism.fish \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 shell/exercism_completion.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
diff --git a/testing/ffsend/APKBUILD b/testing/ffsend/APKBUILD
index 615c3a0363c77865aa8b7937e8f2ea0d9ba663d8..47ce3dce0fcb99a4c51c6dfe14c94c7e98bac474 100644
--- a/testing/ffsend/APKBUILD
+++ b/testing/ffsend/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ffsend
 pkgver=0.2.76
-pkgrel=3
+pkgrel=4
 pkgdesc="A fully featured Firefox Send client"
 url="https://gitlab.com/timvisee/ffsend"
 # riscv64: blocked by cargo
@@ -49,7 +49,7 @@ package() {
 	install -Dm644 contrib/completions/_ffsend \
 		-t "$pkgdir"/usr/share/zsh/site-functions/
 	install -Dm644 contrib/completions/ffsend.fish \
-		-t "$pkgdir"/usr/share/fish/completions/
+		-t "$pkgdir"/usr/share/fish/vendor_completions.d/
 
 	# See infer-commands in the readme.
 	ln -s ffsend "$pkgdir"/usr/bin/ffget
diff --git a/testing/flameshot/APKBUILD b/testing/flameshot/APKBUILD
index 73858066bce0260c5e67f6de40c860a0b83c6f2b..96bee25ed82182ec40762a6adf227e8ee92a4d6c 100644
--- a/testing/flameshot/APKBUILD
+++ b/testing/flameshot/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=flameshot
 pkgver=12.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Featureful screenshot app"
 options="!check" # No test suite
 url="https://github.com/flameshot-org/flameshot"
@@ -42,9 +42,9 @@ build() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 
-	mkdir -p "$pkgdir"/usr/share/fish/completions
+	mkdir -p "$pkgdir"/usr/share/fish/vendor_completions.d
 	mv "$pkgdir"/usr/share/fish/vendor_completions.d/flameshot.fish \
-		"$pkgdir"/usr/share/fish/completions
+		"$pkgdir"/usr/share/fish/vendor_completions.d
 
 	rmdir "$pkgdir"/usr/share/fish/vendor_completions.d
 }
diff --git a/testing/flux/APKBUILD b/testing/flux/APKBUILD
index 774c795ba5f10578635135a2aee5f02c5934fd28..1585b3792e9d7bb6cc48d12ac74e2a9a7517873f 100644
--- a/testing/flux/APKBUILD
+++ b/testing/flux/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=flux
 pkgver=0.41.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Open and extensible continuous delivery solution for Kubernetes"
 url="https://fluxcd.io/"
 arch="all"
@@ -48,7 +48,7 @@ package() {
 	install -Dm644 $pkgname.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 	install -Dm644 $pkgname.fish \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 $pkgname.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
diff --git a/testing/glow/APKBUILD b/testing/glow/APKBUILD
index c1413d123da1019dfbeae4d4478e8b728712ec42..36710b25498fcbd06cb7370aec6aa324c88ce796 100644
--- a/testing/glow/APKBUILD
+++ b/testing/glow/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=glow
 pkgver=1.5.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Markdown renderer on the CLI, with pizzazz"
 url="https://github.com/charmbracelet/glow"
 arch="all"
@@ -37,7 +37,7 @@ package() {
 	install -Dm644 $pkgname.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 	install -Dm644 $pkgname.fish \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 $pkgname.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
diff --git a/testing/golangci-lint/APKBUILD b/testing/golangci-lint/APKBUILD
index 6a2c9d9f398d6552f116131e4f4419e5d41d1c18..72333db9635be87eced4890272ca5ae3af2754a2 100644
--- a/testing/golangci-lint/APKBUILD
+++ b/testing/golangci-lint/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=golangci-lint
 pkgver=1.53.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Fast linters runner for Go"
 url="https://golangci-lint.run/"
 arch="all"
@@ -44,7 +44,7 @@ package() {
 	install -Dm644 golangci-lint.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_golangci-lint
 	install -Dm644 golangci-lint.fish \
-		"$pkgdir"/usr/share/fish/completions/golangci-lint.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/golangci-lint.fish
 }
 
 sha512sums="
diff --git a/testing/halp/APKBUILD b/testing/halp/APKBUILD
index e1bd34a54dcbebb96f3ed311acfd5dcda7200dad..25a942a1febd1d7747b4d365b402557b7dfe60a0 100644
--- a/testing/halp/APKBUILD
+++ b/testing/halp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Orhun Parmaksız <orhunparmaksiz@gmail.com>
 pkgname=halp
 pkgver=0.1.7
-pkgrel=0
+pkgrel=1
 pkgdesc="A CLI tool to get help with CLI tools"
 url="https://github.com/orhun/halp"
 # s390x, ppc64le, riscv64: blocked by ring crate
@@ -43,7 +43,7 @@ package() {
 	install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname"
 	install -Dm 644 "man/$pkgname.1" -t "$pkgdir/usr/share/man/man1"
 	install -Dm 644 "completions/$pkgname.bash" "$pkgdir/usr/share/bash-completion/completions/$pkgname"
-	install -Dm 644 "completions/$pkgname.fish" -t "$pkgdir/usr/share/fish/completions"
+	install -Dm 644 "completions/$pkgname.fish" -t "$pkgdir/usr/share/fish/vendor_completions.d"
 	install -Dm 644 "completions/_$pkgname" -t "$pkgdir/usr/share/zsh/site-functions"
 }
 
diff --git a/testing/helmfile/APKBUILD b/testing/helmfile/APKBUILD
index 16a9f17327f4d6de3cf02c9ad79d94d50c7d11b0..7657e50d820ced232183a8ccdc9a2634c4e59b02 100644
--- a/testing/helmfile/APKBUILD
+++ b/testing/helmfile/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=helmfile
 pkgver=0.153.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Declarative spec for deploying helm charts"
 url="https://helmfile.readthedocs.io/"
 arch="all"
@@ -50,7 +50,7 @@ package() {
 	install -Dm644 helmfile.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_helmfile
 	install -Dm644 helmfile.fish \
-		"$pkgdir"/usr/share/fish/completions/helmfile.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/helmfile.fish
 }
 
 sha512sums="
diff --git a/testing/hub/APKBUILD b/testing/hub/APKBUILD
index 103aec6e6368b311a3508526189937966459a030..a835fe0f388327f47bf2f7bf341efd7a0cd7b132 100644
--- a/testing/hub/APKBUILD
+++ b/testing/hub/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
 pkgname=hub
 pkgver=2.14.2
-pkgrel=16
+pkgrel=17
 pkgdesc="Extends git with extra features for GitHub"
 url="https://hub.github.com/"
 arch="all"
@@ -48,7 +48,7 @@ package() {
 	install -Dm644 "$builddir"/etc/$pkgname.zsh_completion \
 		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 	install -Dm644 "$builddir"/etc/$pkgname.fish_completion \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 }
 
 sha512sums="4809d12966cc983f42c8aef482e07bc4226e25fc4deba838e418664ce14ac9d2ac42842d0721a46466a80c0e492392542ecfaaccc2cea0efdd60df8b60a3ca02  hub-2.14.2.tar.gz"
diff --git a/testing/hubble-cli/APKBUILD b/testing/hubble-cli/APKBUILD
index 5c846c176e976fa13e165149a74686be0706140a..9568380c3fc4689729e50a816e9e76d6a647244f 100644
--- a/testing/hubble-cli/APKBUILD
+++ b/testing/hubble-cli/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=hubble-cli
 pkgver=0.11.5
-pkgrel=0
+pkgrel=1
 pkgdesc="CLI for the distributed networking and security observability platform"
 url="https://github.com/cilium/hubble"
 arch="all"
@@ -40,7 +40,7 @@ package() {
 	install -Dm644 hubble.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/hubble
 	install -Dm644 hubble.fish \
-		"$pkgdir"/usr/share/fish/completions/hubble.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/hubble.fish
 	install -Dm644 hubble.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_hubble
 }
diff --git a/testing/hwatch/APKBUILD b/testing/hwatch/APKBUILD
index dca807d121c0cc359b2c89b715c2401189aede98..9991542f1b3b7c61de993f398ce6aed08f54b3e9 100644
--- a/testing/hwatch/APKBUILD
+++ b/testing/hwatch/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=hwatch
 pkgver=0.3.10
-pkgrel=0
+pkgrel=1
 pkgdesc="A modern alternative to the watch command"
 url="https://github.com/blacknon/hwatch"
 arch="aarch64 armhf armv7 ppc64le x86 x86_64"  # blocked by rust/cargo
@@ -32,7 +32,7 @@ build() {
 package() {
 	install -D -m755 target/release/$pkgname -t "$pkgdir"/usr/bin/
 	install -D -m644 man/$pkgname.1 -t "$pkgdir"/usr/share/man/man1/
-	install -D -m644 completion/fish/* -t "$pkgdir"/usr/share/fish/completions/
+	install -D -m644 completion/fish/* -t "$pkgdir"/usr/share/fish/vendor_completions.d/
 	install -D -m644 completion/zsh/* -t "$pkgdir"/usr/share/zsh/site-functions/
 }
 
diff --git a/testing/innernet/APKBUILD b/testing/innernet/APKBUILD
index 96d1f407edc18c5e2edd0d0676de7047767c45cd..90c3b555485b49a2a7140377917bfbdbc80e56df 100644
--- a/testing/innernet/APKBUILD
+++ b/testing/innernet/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Uli Baum <xeji@cat3.de>
 pkgname=innernet
 pkgver=1.5.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A private network system that uses WireGuard under the hood"
 arch="all !armhf !ppc64le" # tests fail on armhf and ppc64le
 url="https://github.com/tonarino/innernet"
@@ -42,7 +42,7 @@ package() {
 
 	for binary in "$pkgname" "$pkgname-server"; do
 		install -Dm 644 "doc/$binary.completions.bash" "$pkgdir/usr/share/bash-completion/completions/$binary"
-		install -Dm 644 "doc/$binary.completions.fish" "$pkgdir/usr/share/fish/completions/$binary.fish"
+		install -Dm 644 "doc/$binary.completions.fish" "$pkgdir/usr/share/fish/vendor_completions.d/$binary.fish"
 		install -Dm 644 "doc/$binary.completions.zsh" "$pkgdir/usr/share/zsh/site-functions/_$binary"
 		install -Dm 644 "doc/$binary.8.gz" "$pkgdir/usr/share/man/man8/$binary.8.gz"
 	done
diff --git a/testing/k3sup/APKBUILD b/testing/k3sup/APKBUILD
index 923c75419af7d715a75864a62289e5af61177ac1..c62e071ea15436a16c82bf5e76be14b7d9a6d20c 100644
--- a/testing/k3sup/APKBUILD
+++ b/testing/k3sup/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
 pkgname=k3sup
 pkgver=0.12.3
-pkgrel=7
+pkgrel=8
 pkgdesc="A light-weight utility to get from zero to KUBECONFIG with k3s"
 url="https://k3sup.dev/"
 arch="all"
@@ -39,7 +39,7 @@ package() {
 	install -Dm755 bin/k3sup "$pkgdir"/usr/bin/k3sup
 
 	install -Dm644 "$builddir"/$pkgname.bash "$pkgdir"/usr/share/bash-completion/completions/$pkgname
-	install -Dm644 "$builddir"/$pkgname.fish "$pkgdir"/usr/share/fish/completions/$pkgname.fish
+	install -Dm644 "$builddir"/$pkgname.fish "$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 "$builddir"/$pkgname.zsh "$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
 
diff --git a/testing/kanister-tools/APKBUILD b/testing/kanister-tools/APKBUILD
index 40fffb5d136df64e87baa6a2e1eef672217fb8df..a47c27963bb2940aaabfeeabb6d9b85d1ce678b0 100644
--- a/testing/kanister-tools/APKBUILD
+++ b/testing/kanister-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=kanister-tools
 pkgver=0.91.0
-pkgrel=1
+pkgrel=2
 pkgdesc="CLI tools for application-level data management on Kubernetes"
 url="https://kanister.io/"
 arch="all"
@@ -51,7 +51,7 @@ package() {
 		install -Dm644 $binary.bash \
 			"$pkgdir"/usr/share/bash-completion/completions/$binary
 		install -Dm644 $binary.fish \
-			"$pkgdir"/usr/share/fish/completions/$binary.fish
+			"$pkgdir"/usr/share/fish/vendor_completions.d/$binary.fish
 		install -Dm644 $binary.zsh \
 			"$pkgdir"/usr/share/zsh/site-functions/_$binary
 	done
diff --git a/testing/kbs2/APKBUILD b/testing/kbs2/APKBUILD
index e9de466f6c3fc0b59dd072518e246c1d58d8676b..5ca3168f136e91aa3eddcfc5657fb2c37b7605d0 100644
--- a/testing/kbs2/APKBUILD
+++ b/testing/kbs2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: psykose <alice@ayaya.dev>
 pkgname=kbs2
 pkgver=0.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Secret manager backed by age"
 url="https://github.com/woodruffw/kbs2"
 arch="all !s390x !riscv64" # blocked by cargo
@@ -39,7 +39,7 @@ package() {
 	install -Dm644 "$builddir"/kbs2.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/kbs2
 	install -Dm644 "$builddir"/kbs2.fish \
-		"$pkgdir"/usr/share/fish/completions/kbs2.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/kbs2.fish
 	install -Dm644 "$builddir"/kbs2.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_kbs2
 }
diff --git a/testing/ko/APKBUILD b/testing/ko/APKBUILD
index 7b336b999501ede60c85e58b1dff961fbc4d05cd..16ace42db5bea486053cac076a2a06eb27b0c94b 100644
--- a/testing/ko/APKBUILD
+++ b/testing/ko/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ariadne Conill <ariadne@dereferenced.org>
 pkgname=ko
 pkgver=0.13.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Build containers from Go projects"
 url="https://ko.build/"
 arch="all"
@@ -34,7 +34,7 @@ package() {
 	install -Dm755 ko -t "$pkgdir"/usr/bin/
 
 	install -Dm644 ko.bash "$pkgdir"/usr/share/bash-completion/completions/ko
-	install -Dm644 ko.fish "$pkgdir"/usr/share/fish/completions/ko.fish
+	install -Dm644 ko.fish "$pkgdir"/usr/share/fish/vendor_completions.d/ko.fish
 	install -Dm644 ko.zsh "$pkgdir"/usr/share/zsh/site-functions/_ko
 }
 
diff --git a/testing/kompose/APKBUILD b/testing/kompose/APKBUILD
index 9e15d39eda03396992a256a1a7cf752ea6cb1b71..258be87d784bf0cb90a8ceee216d29a76d647fa5 100644
--- a/testing/kompose/APKBUILD
+++ b/testing/kompose/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: TBK <alpine@jjtc.eu>
 pkgname=kompose
 pkgver=1.28.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Tool to move from docker-compose to Kubernetes"
 url="https://kompose.io/"
 license="Apache-2.0"
@@ -34,7 +34,7 @@ package() {
 
 	install -Dm644 completion.bash "$pkgdir"/usr/share/bash-completion/completions/$pkgname
 	install -Dm644 completion.zsh "$pkgdir"/usr/share/zsh/site-functions/_$pkgname
-	install -Dm644 completion.fish "$pkgdir"/usr/share/fish/completions/$pkgname.fish
+	install -Dm644 completion.fish "$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 }
 
 sha512sums="
diff --git a/testing/kubepug/APKBUILD b/testing/kubepug/APKBUILD
index 479629e2d06851b657dd13c790d5428b778bd364..87485f5e53c854645098f21b29ea863d24ed25a2 100644
--- a/testing/kubepug/APKBUILD
+++ b/testing/kubepug/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=kubepug
 pkgver=1.4.0
-pkgrel=9
+pkgrel=10
 pkgdesc="Kubernetes pre-upgrade deprecation checker"
 url="https://github.com/rikatz/kubepug"
 arch="all"
@@ -44,7 +44,7 @@ package() {
 	install -Dm644 kubepug.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_kubepug
 	install -Dm644 kubepug.fish \
-		"$pkgdir"/usr/share/fish/completions/kubepug.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/kubepug.fish
 }
 
 sha512sums="
diff --git a/testing/kubeshark/APKBUILD b/testing/kubeshark/APKBUILD
index 3f04867755587044eedd86ac1f38a0459ad651d8..1e4c7750752ae3441c760b5a512ea47b558bcd7e 100644
--- a/testing/kubeshark/APKBUILD
+++ b/testing/kubeshark/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=kubeshark
 pkgver=40.2
-pkgrel=0
+pkgrel=1
 pkgdesc="API traffic viewer for Kubernetes"
 url="https://kubeshark.co/"
 arch="all"
@@ -44,7 +44,7 @@ package() {
 	install -Dm644 $pkgname.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 	install -Dm644 $pkgname.fish \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 $pkgname.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
diff --git a/testing/kumactl/APKBUILD b/testing/kumactl/APKBUILD
index 0be1c8ade6e92ed7ba61ef61ee12b9284d2aeb8a..b0dd64a1702c914603b15fc44f86e3d19ea9e709 100644
--- a/testing/kumactl/APKBUILD
+++ b/testing/kumactl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=kumactl
 pkgver=2.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="CLI for the multi-zone service mesh Kuma"
 url="https://kuma.io"
 # The only build targets for eBPF module
@@ -52,7 +52,7 @@ package() {
 	install -Dm644 $pkgname.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 	install -Dm644 $pkgname.fish \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 $pkgname.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
diff --git a/testing/laze/APKBUILD b/testing/laze/APKBUILD
index 2e1cfd20e45b00368a2c1ab38bd6f830a9f946e3..6a7fd3f60100453a9cbcc45a6c399a3230e8a79e 100644
--- a/testing/laze/APKBUILD
+++ b/testing/laze/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kaspar Schleiser <kaspar@schleiser.de>
 pkgname=laze
 pkgver=0.1.15
-pkgrel=1
+pkgrel=2
 pkgdesc="laze is a build system based on Ninja, aiming to be the next goto-alternative to make"
 url="https://laze-build.org"
 arch="all"
@@ -51,7 +51,7 @@ package() {
 	install -Dm644 "tmp/completions/bash" \
 		"$pkgdir/usr/share/bash-completion/completions/laze"
 	install -Dm644 "tmp/completions/fish" \
-		"$pkgdir/usr/share/fish/completions/laze.fish"
+		"$pkgdir/usr/share/fish/vendor_completions.d/laze.fish"
 	install -Dm644 "tmp/completions/zsh" \
 		"$pkgdir/usr/share/zsh/site-functions/_laze"
 }
diff --git a/testing/linkerd-cli/APKBUILD b/testing/linkerd-cli/APKBUILD
index 54c3a31896e8c8031b798b585495f59c8ce1528e..315a8815860759fc5321bbd5d5893f0de58bc97d 100644
--- a/testing/linkerd-cli/APKBUILD
+++ b/testing/linkerd-cli/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=linkerd-cli
 pkgver=2.13.3
-pkgrel=0
+pkgrel=1
 pkgdesc="CLI utility for Linkerd service mesh"
 url="https://linkerd.io/"
 arch="all"
@@ -57,7 +57,7 @@ package() {
 	install -Dm644 linkerd.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/linkerd
 	install -Dm644 linkerd.fish \
-		"$pkgdir"/usr/share/fish/completions/linkerd.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/linkerd.fish
 	install -Dm644 linkerd.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_linkerd
 }
diff --git a/testing/mangal/APKBUILD b/testing/mangal/APKBUILD
index 2a24f47f2989a0086a3e20f5a634526ab733b031..990553f719d7cd89181daf6c2ae60cfd0661fb2e 100644
--- a/testing/mangal/APKBUILD
+++ b/testing/mangal/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=mangal
 pkgver=4.0.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Fancy TUI manga downloader"
 url="https://github.com/metafates/mangal"
 arch="all"
@@ -33,7 +33,7 @@ package() {
 	install -Dm644 completions/$pkgname.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 	install -Dm644 completions/$pkgname.fish \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 completions/$pkgname.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
diff --git a/testing/mdcat/APKBUILD b/testing/mdcat/APKBUILD
index 95d33848532e693297ac3002eb7d64431a5488d4..9651fdccac0f08be66057a0afa66831f018b87bd 100644
--- a/testing/mdcat/APKBUILD
+++ b/testing/mdcat/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=mdcat
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Cat for markdown"
 url="https://github.com/swsnr/mdcat"
 #Undefined temporary symbol .LBB16_2
@@ -45,9 +45,9 @@ package() {
 	install -Dm644 target/release/build/mdcat-*/out/completions/_mdless \
 		-t "$pkgdir"/usr/share/zsh/site-functions
 	install -Dm644 target/release/build/mdcat-*/out/completions/mdcat.fish \
-		-t "$pkgdir"/usr/share/fish/completions
+		-t "$pkgdir"/usr/share/fish/vendor_completions.d
 	install -Dm644 target/release/build/mdcat-*/out/completions/mdless.fish \
-		-t "$pkgdir"/usr/share/fish/completions
+		-t "$pkgdir"/usr/share/fish/vendor_completions.d
 
 	# Install the generated man-page
 	install -Dm644 "$builddir"/target/release/build/mdcat-*/out/mdcat.1 \
diff --git a/testing/minikube/APKBUILD b/testing/minikube/APKBUILD
index 8fba692afbd6165493ac43951359887dfc09398b..3a1a2c3ff1714efcbcb6eefa1611d01824703164 100644
--- a/testing/minikube/APKBUILD
+++ b/testing/minikube/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Magicloud <magiclouds@gmail.com>
 pkgname=minikube
 pkgver=1.30.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Tool that makes it easy to run Kubernetes locally"
 url="https://github.com/kubernetes/minikube"
 license="Apache-2.0"
@@ -45,7 +45,7 @@ package() {
 	install -Dm755 docker-machine-driver-kvm2 "$pkgdir"/usr/bin/docker-machine-driver-kvm2
 
 	install -Dm644 $pkgname.bash "$pkgdir"/usr/share/bash-completion/completions/$pkgname
-	install -Dm644 $pkgname.fish "$pkgdir"/usr/share/fish/completions/$pkgname.fish
+	install -Dm644 $pkgname.fish "$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 $pkgname.zsh "$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
 
diff --git a/testing/nb/APKBUILD b/testing/nb/APKBUILD
index 80f9b9c89b96dc2f2a58800ba25fc017ec39766d..ed51cc4ae47749dba2a9d6c184602e44355295ee 100644
--- a/testing/nb/APKBUILD
+++ b/testing/nb/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:Quillith <tag.quill@protonmail.com>
 pkgname=nb
 pkgver=7.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Command line note-taking, bookmarking, archiving, and knowledge base application"
 url="https://github.com/xwmx/nb"
 arch="noarch"
@@ -24,7 +24,7 @@ package() {
 	install -Dm644 README.md "$pkgdir/usr/share/doc/nb/README.md"
 	# Completions
 	install -Dm644 etc/nb-completion.bash "$pkgdir/usr/share/bash-completion/completions/nb"
-	install -Dm644 etc/nb-completion.fish "$pkgdir/usr/share/fish/completions/nb.fish"
+	install -Dm644 etc/nb-completion.fish "$pkgdir/usr/share/fish/vendor_completions.d/nb.fish"
 	install -Dm644 etc/nb-completion.zsh "$pkgdir/usr/share/zsh/site-functions/_nb"
 	# Plugins
 	install -Dm644 -t "$pkgdir/usr/share/nb/plugins/" plugins/*
diff --git a/testing/nix/APKBUILD b/testing/nix/APKBUILD
index 0510075ebe04637ecb0eded5b0917dba9e3c859c..689218fd4ff9293be8e1872c50412517d17d4c6f 100644
--- a/testing/nix/APKBUILD
+++ b/testing/nix/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=nix
 pkgver=2.13.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The purely functional package manager"
 url="https://nixos.org/nix/"
 arch="x86 x86_64 aarch64"  # supported platforms
@@ -104,7 +104,7 @@ package() {
 	rm -f usr/bin/nix-daemon
 	ln -s ../bin/nix usr/sbin/nix-daemon
 
-	mv usr/share/fish/vendor_completions.d usr/share/fish/completions
+	mv usr/share/fish/vendor_completions.d usr/share/fish/vendor_completions.d
 
 	install -m 755 -D "$srcdir"/nix-profile.sh etc/profile.d/nix.sh
 	install -m 755 -D "$srcdir"/nix-daemon.initd etc/init.d/nix-daemon
diff --git a/testing/openservicemesh-cli/APKBUILD b/testing/openservicemesh-cli/APKBUILD
index 4d0adc13d010f6b092b690a21f0477965476c46d..e7fc57c7347884bb077cdfec60006a112c7bd38c 100644
--- a/testing/openservicemesh-cli/APKBUILD
+++ b/testing/openservicemesh-cli/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=openservicemesh-cli
 pkgver=1.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="CLI for the Open Service Mesh (OSM)"
 url="https://openservicemesh.io/"
 arch="all"
@@ -42,7 +42,7 @@ package() {
 	install -Dm644 osm.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/osm
 	install -Dm644 osm.fish \
-		"$pkgdir"/usr/share/fish/completions/osm.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/osm.fish
 	install -Dm644 osm.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_osm
 }
diff --git a/testing/oras-cli/APKBUILD b/testing/oras-cli/APKBUILD
index 7fb90396e5cdfc693975587339ecef5c84bc2d6e..1f43bf54205c91b39574f497933e9b9a19bfad7c 100644
--- a/testing/oras-cli/APKBUILD
+++ b/testing/oras-cli/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=oras-cli
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="OCI registry client"
 url="https://oras.land/cli"
 arch="all"
@@ -43,7 +43,7 @@ package() {
 	install -Dm644 oras.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/oras
 	install -Dm644 oras.fish \
-		"$pkgdir"/usr/share/fish/completions/oras.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/oras.fish
 	install -Dm644 oras.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_oras
 }
diff --git a/testing/ouch/APKBUILD b/testing/ouch/APKBUILD
index cb3a078a41827f5c398ce8d4047e73ef92d544bb..93c85d0fbde0c188011df1e2482eba572147e3ef 100644
--- a/testing/ouch/APKBUILD
+++ b/testing/ouch/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: guddaff <guddaff@protonmail.com>
 pkgname=ouch
 pkgver=0.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Painless compression and decompression"
 url="https://github.com/ouch-org/ouch"
 arch="all"
@@ -43,7 +43,7 @@ package() {
 	install -Dm644 ouch.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/ouch
 	install -Dm644 ouch.fish \
-		"$pkgdir"/usr/share/fish/completions/ouch.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/ouch.fish
 	install -Dm644 _ouch \
 		"$pkgdir"/usr/share/zsh/site-functions/_ouch
 }
diff --git a/testing/pastel/APKBUILD b/testing/pastel/APKBUILD
index 4437679a952277d3700444989f78e3d0995c7e1c..e99f83f89c180d9b0c2feaeaf663a1bdc0e896f1 100644
--- a/testing/pastel/APKBUILD
+++ b/testing/pastel/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Joe Searle <joe@jsearle.net>
 pkgname=pastel
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A command-line tool to generate, analyze, convert and manipulate colors"
 url="https://github.com/sharkdp/pastel"
 arch="all !s390x !riscv64" # rust/cargo
@@ -34,7 +34,7 @@ package() {
 	install -Dm644 "$builddir"/completions/_pastel \
 		"$pkgdir"/usr/share/zsh/site-functions/_pastel
 	install -Dm644 "$builddir"/completions/pastel.fish \
-		"$pkgdir"/usr/share/fish/completions/pastel.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/pastel.fish
 }
 
 sha512sums="
diff --git a/testing/pdd/APKBUILD b/testing/pdd/APKBUILD
index 62935b7be337f978bd0c76be2a63a2ecd037014f..d9f5822ecf8c2ac41ffef07e916e29cf749aa6e8 100644
--- a/testing/pdd/APKBUILD
+++ b/testing/pdd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Grigory Kirillov <txgk@bk.ru>
 pkgname=pdd
 pkgver=1.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Tiny date, time diff calculator with piggybacked timers"
 url="https://github.com/jarun/pdd"
 arch="noarch"
@@ -30,7 +30,7 @@ package() {
 	mv "$pkgdir"/usr/share/bash-completion/compilations \
 		"$pkgdir"/usr/share/bash-completion/completions
 	mv "$pkgdir"/usr/share/fish/vendor_completions.d \
-		"$pkgdir"/usr/share/fish/completions
+		"$pkgdir"/usr/share/fish/vendor_completions.d
 }
 
 sha512sums="
diff --git a/testing/pulumi-language-java/APKBUILD b/testing/pulumi-language-java/APKBUILD
index e464f21eff6643531624d01c42a7e269ae0887fc..57a3ead185164c4aa998b00a4661d42679751eaf 100644
--- a/testing/pulumi-language-java/APKBUILD
+++ b/testing/pulumi-language-java/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=pulumi-language-java
 pkgver=0.9.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Infrastructure as Code SDK (Java language provider)"
 url="https://pulumi.com/"
 # blocked by pulumi
@@ -52,7 +52,7 @@ package() {
 	install -Dm644 pulumi-java-gen.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/pulumi-java-gen
 	install -Dm644 pulumi-java-gen.fish \
-		"$pkgdir"/usr/share/fish/completions/pulumi-java-gen.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/pulumi-java-gen.fish
 	install -Dm644 pulumi-java-gen.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_pulumi-java-gen
 }
diff --git a/testing/pulumi/APKBUILD b/testing/pulumi/APKBUILD
index 67a5d8886739c53e5467cf95bd3bb340c74143d4..a4cfea55c4ca57bb1310e656932f61706231d599 100644
--- a/testing/pulumi/APKBUILD
+++ b/testing/pulumi/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=pulumi
 pkgver=3.69.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Infrastructure as Code SDK"
 url="https://pulumi.com/"
 # Tests show that pulumi's plugin system doesn't work on any other platforms
@@ -80,7 +80,7 @@ package() {
 	install -Dm644 pulumi.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/pulumi
 	install -Dm644 pulumi.fish \
-		"$pkgdir"/usr/share/fish/completions/pulumi.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/pulumi.fish
 	install -Dm644 pulumi.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_pulumi
 }
diff --git a/testing/py-spy/APKBUILD b/testing/py-spy/APKBUILD
index 8d3421352f17f010222b09e252e4d64a4a56892a..d0ace8e67b4abcb63b7b990ded3d7c56d1ea7eae 100644
--- a/testing/py-spy/APKBUILD
+++ b/testing/py-spy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: messense <messense@icloud.com>
 pkgname=py-spy
 pkgver=0.3.14
-pkgrel=2
+pkgrel=3
 pkgdesc="Sampling profiler for Python programs"
 url="https://github.com/benfred/py-spy"
 arch="aarch64 x86_64 ppc64le" # limited by rust
@@ -54,7 +54,7 @@ package() {
 	install -Dm0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 
 	install -Dm644 $pkgname.bash "$pkgdir"/usr/share/bash-completion/completions/$pkgname
-	install -Dm644 $pkgname.fish "$pkgdir"/usr/share/fish/completions/$pkgname.fish
+	install -Dm644 $pkgname.fish "$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 $pkgname.zsh "$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
 
diff --git a/testing/rage/APKBUILD b/testing/rage/APKBUILD
index 8e3306e97e9d1bed4fc776ea13e30940bd4d6076..5313e6ec1ef45beb05cf4ac5b9fbc779a8031564 100644
--- a/testing/rage/APKBUILD
+++ b/testing/rage/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michał Polański <michal@polanski.me>
 pkgname=rage
 pkgver=0.9.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple, modern and secure encryption tool"
 url="https://github.com/str4d/rage"
 license="Apache-2.0 OR MIT"
@@ -45,7 +45,7 @@ package() {
 		install -Dm644 target/completions/$cmd.bash \
 			"$pkgdir"/usr/share/bash-completion/completions/$cmd
 		install -Dm644 target/completions/$cmd.fish \
-			"$pkgdir"/usr/share/fish/completions/$cmd.fish
+			"$pkgdir"/usr/share/fish/vendor_completions.d/$cmd.fish
 		install -Dm644 target/completions/$cmd.zsh \
 			"$pkgdir"/usr/share/zsh/site-functions/_$cmd
 	done
diff --git a/testing/rbw/APKBUILD b/testing/rbw/APKBUILD
index ee118967fa826e7b5cd500f12fec77a7866cc326..5e6b7a53f3686ca7edfcc3ca0dd621ee4bf966ae 100644
--- a/testing/rbw/APKBUILD
+++ b/testing/rbw/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: crapStone <crapstone01@gmail.com>
 pkgname=rbw
 pkgver=1.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Unofficial command line client for Bitwarden."
 url="https://git.tozt.net/rbw"
 arch="all !s390x !riscv64 !ppc64le" # limited by cargo, dependency ring does not support ppc64le
@@ -41,7 +41,7 @@ package() {
 	install -Dm644 rbw.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/rbw
 	install -Dm644 rbw.fish \
-		"$pkgdir"/usr/share/fish/completions/rbw.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/rbw.fish
 	install -Dm644 _rbw \
 		"$pkgdir"/usr/share/zsh/site-functions/_rbw
 }
diff --git a/testing/rebar3/APKBUILD b/testing/rebar3/APKBUILD
index dffc9f1b0d0efc96d1aa59898452b30cbcd2f50d..81a8b61244a540e5c29149146e97111080e4c9ed 100644
--- a/testing/rebar3/APKBUILD
+++ b/testing/rebar3/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: psykose <alice@ayaya.dev>
 pkgname=rebar3
 pkgver=3.22.0
-pkgrel=0
+pkgrel=1
 _meck=0.8.13
 pkgdesc="Erlang build tool"
 url="https://github.com/erlang/rebar3"
@@ -42,7 +42,7 @@ package() {
 	install -Dm644 manpages/rebar3.1 \
 		-t "$pkgdir"/usr/share/man/man1/
 	install -Dm644 apps/rebar/priv/shell-completion/fish/rebar3.fish \
-		-t "$pkgdir"/usr/share/fish/completions/
+		-t "$pkgdir"/usr/share/fish/vendor_completions.d/
 	install -Dm644 apps/rebar/priv/shell-completion/bash/rebar3 \
 		-t "$pkgdir"/usr/share/bash-completion/completions/
 	install -Dm644 apps/rebar/priv/shell-completion/zsh/_rebar3 \
diff --git a/testing/repgrep/APKBUILD b/testing/repgrep/APKBUILD
index f886dfbf8606de7a9ce4d98cf110528e25a14ef4..2ae50910bed4e695304d8d9782793646e430d89e 100644
--- a/testing/repgrep/APKBUILD
+++ b/testing/repgrep/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=repgrep
 _pkgname=rgr
 pkgver=0.14.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Interactive command line replacer for ripgrep"
 url="https://github.com/acheronfail/repgrep"
 arch="all"
@@ -43,7 +43,7 @@ package() {
 	install -Dm 644 LICENSE-MIT -t "$pkgdir/usr/share/licenses/$pkgname"
 	out_dir=$(find target -name repgrep-stamp -print0 | xargs -0 ls -t | head -n1 | xargs dirname)
 	install -Dm 644 "$out_dir/$_pkgname.bash" "$pkgdir/usr/share/bash-completion/completions/$_pkgname"
-	install -Dm 644 "$out_dir/$_pkgname.fish" "$pkgdir/usr/share/fish/completions/$_pkgname.fish"
+	install -Dm 644 "$out_dir/$_pkgname.fish" "$pkgdir/usr/share/fish/vendor_completions.d/$_pkgname.fish"
 	install -Dm 644 "$out_dir/_$_pkgname" "$pkgdir/usr/share/zsh/site-functions/_$_pkgname"
 	install -Dm 644 "$out_dir/$_pkgname.1" -t "$pkgdir/usr/share/man/man1"
 }
diff --git a/testing/river/APKBUILD b/testing/river/APKBUILD
index 4e97f34d5b655301b4581898eea29efea5c5227a..f95714b36c22adcc27022623fdfb7fafa70d66e3 100644
--- a/testing/river/APKBUILD
+++ b/testing/river/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Anjandev Momi <anjan@momi.ca>
 pkgname=river
 pkgver=0.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Dynamic Tiling Wayland Compositor"
 url="https://github.com/riverwm/river"
 arch="x86_64 aarch64" # limited by zig aport
@@ -54,9 +54,9 @@ package() {
 	install -Dm0644 example/init -t "$pkgdir"/usr/share/doc/river/examples
 
 	# Fix location of fish completion
-	mkdir -p "$pkgdir"/usr/share/fish/completions/
+	mkdir -p "$pkgdir"/usr/share/fish/vendor_completions.d/
 	mv "$pkgdir"/usr/share/fish/vendor_completions.d/*.fish \
-		"$pkgdir"/usr/share/fish/completions/
+		"$pkgdir"/usr/share/fish/vendor_completions.d/
 	rm -rf "$pkgdir"/usr/share/fish/vendor_completions.d
 }
 
diff --git a/testing/ruff/APKBUILD b/testing/ruff/APKBUILD
index 9e849e722bc364ca0f06ca6996e49608897cf752..299c4fc9f67f24a1370387ae055363cf3246219f 100644
--- a/testing/ruff/APKBUILD
+++ b/testing/ruff/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hugo Osvaldo Barrera <hugo@whynothugo.nl>
 pkgname=ruff
 pkgver=0.0.275
-pkgrel=0
+pkgrel=1
 pkgdesc="Extremely fast Python linter"
 url="https://github.com/charliermarsh/ruff"
 # ppc64le, s390x, riscv64: ring
@@ -51,7 +51,7 @@ package() {
 	install -Dm644 $pkgname.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 	install -Dm644 $pkgname.fish \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 $pkgname.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
diff --git a/testing/rustic/APKBUILD b/testing/rustic/APKBUILD
index 4ad4be82456b3c8c0d2c09eda8327b32a6dc33db..bec804ba323f8b09f97e440250b2c8703b62eaea 100644
--- a/testing/rustic/APKBUILD
+++ b/testing/rustic/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=rustic
 # NOTE: do not move out of the testing repository until upstream says it's no longer beta-quality software
 pkgver=0.5.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Fast, encrypted, deduplicated backups"
 url="https://github.com/rustic-rs/rustic"
 license="MIT OR Apache-2.0"
@@ -41,7 +41,7 @@ package() {
 	install -Dm755 target/release/$pkgname -t "$pkgdir"/usr/bin/
 
 	install -Dm644 $pkgname.bash "$pkgdir"/usr/share/bash-completion/completions/$pkgname
-	install -Dm644 $pkgname.fish "$pkgdir"/usr/share/fish/completions/$pkgname.fish
+	install -Dm644 $pkgname.fish "$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 $pkgname.zsh "$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
 
diff --git a/testing/scaleway-cli/APKBUILD b/testing/scaleway-cli/APKBUILD
index add6a37f265a3ea42036fdb1cd4017d0e351b79d..327e804e26031a4ae7923dcb79d4ee3f6fb8d466 100644
--- a/testing/scaleway-cli/APKBUILD
+++ b/testing/scaleway-cli/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Thomas Kienlen <kommander@laposte.net>
 pkgname=scaleway-cli
 pkgver=2.15.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Command-line client for Scaleway Cloud"
 url="https://www.scaleway.com/en/cli"
 arch="all !x86 !armv7 !armhf" # tests are failing for x86, armv7, armhf
@@ -35,7 +35,7 @@ package() {
 	install -Dm755 scw "$pkgdir"/usr/bin/scw
 
 	install -Dm644 bashcomp "$pkgdir"/usr/share/bash-completion/completions/scw
-	install -Dm644 fishcomp "$pkgdir"/usr/share/fish/completions/scw.fish
+	install -Dm644 fishcomp "$pkgdir"/usr/share/fish/vendor_completions.d/scw.fish
 	install -Dm644 zshcomp "$pkgdir"/usr/share/zsh/site-functions/_scw
 
 }
diff --git a/testing/sd/APKBUILD b/testing/sd/APKBUILD
index 6ba5ddb667ca17184cdc2d6b111b1f90412baa1b..f770b7c656a80eca1f76216a44bc2335260fc0a3 100644
--- a/testing/sd/APKBUILD
+++ b/testing/sd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=sd
 pkgver=0.7.6
-pkgrel=3
+pkgrel=4
 pkgdesc="An intuitive find & replace CLI"
 url="https://github.com/chmln/sd"
 arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # limited by rust/cargo
@@ -41,7 +41,7 @@ package() {
 	find target/release -name "$pkgname.bash" \
 		-exec install -Dm644 {} "$pkgdir"/usr/share/bash-completion/completions/"$pkgname" \;
 	find target/release -name "$pkgname.fish" \
-		-exec install -Dm644 {} "$pkgdir"/usr/share/fish/completions/"$pkgname.fish" \;
+		-exec install -Dm644 {} "$pkgdir"/usr/share/fish/vendor_completions.d/"$pkgname.fish" \;
 	find target/release -name "_$pkgname" \
 		-exec install -Dm644 {} "$pkgdir"/usr/share/zsh/site-functions/"_$pkgname" \;
 }
diff --git a/testing/shotman/APKBUILD b/testing/shotman/APKBUILD
index e3559fc1f9b073737b8011cb31cc3d7c26f683ca..86a14a37f2833553dc6797c61c7fa1b5489a3964 100644
--- a/testing/shotman/APKBUILD
+++ b/testing/shotman/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hugo Osvaldo Barrera <hugo@whynothugo.nl>
 pkgname=shotman
 pkgver=0.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Uncompromising screenshot GUI for Wayland"
 url="https://git.sr.ht/~whynothugo/shotman"
 # s390x: nix/libc crate
@@ -45,7 +45,7 @@ package() {
 	install -Dm644 $pkgname.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 	install -Dm644 $pkgname.fish \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 $pkgname.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 
diff --git a/testing/startup/APKBUILD b/testing/startup/APKBUILD
index 666c619b4e63e43e07e3e668123551085b17c588..e7ec5405a2bc4fb3c18f97668f95a175abc29414 100644
--- a/testing/startup/APKBUILD
+++ b/testing/startup/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=startup
 pkgver=2.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Event driven task and service manager"
 options="!check"
 url="https://gitlab.com/chinstrap/startup"
@@ -63,7 +63,7 @@ package() {
 
 	# Install fish completion
 	install -Dm0644 contrib/fish_completion/*.fish \
-		-t "$pkgdir"/usr/share/fish/completions
+		-t "$pkgdir"/usr/share/fish/vendor_completions.d
 	
 	mkdir -p "$pkgdir"/usr/share/dbus-1/system.d/
 	mv "$pkgdir"/etc/dbus-1/system.d/* "$pkgdir"/usr/share/dbus-1/system.d/
@@ -77,8 +77,8 @@ tools() {
 	amove usr/bin/startup-monitor
 	amove usr/share/icons
 	amove usr/share/applications
-	amove usr/share/fish/completions/initctl2dot.fish
-	amove usr/share/fish/completions/startup-monitor.fish
+	amove usr/share/fish/vendor_completions.d/initctl2dot.fish
+	amove usr/share/fish/vendor_completions.d/startup-monitor.fish
 }
 
 dconf() {
diff --git a/testing/stern/APKBUILD b/testing/stern/APKBUILD
index 04bd27280972f91348b6dd1fe577146194f0389f..b3e03cd36c6cd99ad989c81847bafab1a4790ea7 100644
--- a/testing/stern/APKBUILD
+++ b/testing/stern/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=stern
 pkgver=1.25.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Multi pod and container log tailing for Kubernetes"
 url="https://github.com/stern/stern"
 arch="all"
@@ -45,7 +45,7 @@ package() {
 	install -Dm644 stern.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_stern
 	install -Dm644 stern.fish \
-		"$pkgdir"/usr/share/fish/completions/stern.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/stern.fish
 }
 
 sha512sums="
diff --git a/testing/stgit/APKBUILD b/testing/stgit/APKBUILD
index 92e878146656559c04173e1baf2a796f5c46d05a..e3f50fe5e86a995cee5b7be4d2802b03dccccd43 100644
--- a/testing/stgit/APKBUILD
+++ b/testing/stgit/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Joseph Benden <joe@benden.us>
 pkgname=stgit
 pkgver=1.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Manage a stack of patches using GIT as a backend"
 arch="noarch"
 url="http://www.procode.org/stgit/"
@@ -60,7 +60,7 @@ package() {
 	install -Dm0644 completion/stgit.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_stgit
 	install -Dm0644 completion/stg.fish \
-		"$pkgdir"/usr/share/fish/completions/stg.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/stg.fish
 
 	# lisp
 	install -Dm0644 contrib/stgit.el -t "$pkgdir"/usr/share/emacs/site-lisp
diff --git a/testing/swww/APKBUILD b/testing/swww/APKBUILD
index 072667b372e175a3a68cd066550f34e753fcf26d..5da73b84c490ab6f081175283b9d7edc8367343d 100644
--- a/testing/swww/APKBUILD
+++ b/testing/swww/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=swww
 pkgver=0.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Efficient animated wallpaper daemon for Wayland compositors"
 url="https://github.com/Horus645/swww"
 arch="all !s390x !riscv64" # Build failed
@@ -41,7 +41,7 @@ package() {
 	install -Dm644 completions/swww.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/swww
 	install -Dm644 completions/swww.fish \
-		"$pkgdir"/usr/share/fish/completions/swww.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/swww.fish
 	install -Dm644 completions/_swww \
 		"$pkgdir"/usr/share/zsh/site-functions/_swww
 }
diff --git a/testing/tealdeer/APKBUILD b/testing/tealdeer/APKBUILD
index f2bd72c70a2578fb7900087031c0fef04b2f6267..fc824663c8e4af0a121651a3934d1ab0fb9830ba 100644
--- a/testing/tealdeer/APKBUILD
+++ b/testing/tealdeer/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=tealdeer
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Very fast implementation of tldr in Rust"
 url="https://dbrgn.github.io/tealdeer/"
 arch="all"
@@ -37,7 +37,7 @@ package() {
 	install -Dm644 completion/bash_tealdeer \
 		"$pkgdir"/usr/share/bash-completion/completions/tldr
 	install -Dm644 completion/fish_tealdeer \
-		"$pkgdir"/usr/share/fish/completions/tldr.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/tldr.fish
 	install -Dm644 completion/zsh_tealdeer \
 		"$pkgdir"/usr/share/zsh/site-functions/_tldr
 }
diff --git a/testing/tetragon-client/APKBUILD b/testing/tetragon-client/APKBUILD
index 2bb94eea96307dc213f80d4f2ee7a8218f6303b2..d6ef6bf5b98bda3e1ae6b8d11b480b708c1d21ae 100644
--- a/testing/tetragon-client/APKBUILD
+++ b/testing/tetragon-client/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=tetragon-client
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="CLI client for eBPF-based Security Observability and Runtime Enforcement"
 url="https://github.com/cilium/tetragon"
 arch="x86_64 aarch64" # fails to build on other platforms
@@ -59,7 +59,7 @@ package() {
 	install -Dm644 tetra.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/tetra
 	install -Dm644 tetra.fish \
-		"$pkgdir"/usr/share/fish/completions/tetra.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/tetra.fish
 	install -Dm644 tetra.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_tetra
 }
diff --git a/testing/tfsec/APKBUILD b/testing/tfsec/APKBUILD
index 800f25373e4026e4261e7dc740e5b98cad19ee85..874b9331fe899a38fa381f34302f1b4053a6be35 100644
--- a/testing/tfsec/APKBUILD
+++ b/testing/tfsec/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=tfsec
 pkgver=1.28.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Security scanner for Terraform code"
 url="https://aquasecurity.github.io/tfsec"
 arch="all"
@@ -39,7 +39,7 @@ package() {
 	install -Dm644 tfsec-checkgen.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/tfsec-checkgen
 	install -Dm644 tfsec-checkgen.fish \
-		"$pkgdir"/usr/share/fish/completions/tfsec-checkgen.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/tfsec-checkgen.fish
 	install -Dm644 tfsec-checkgen.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_tfsec-checkgen
 }
diff --git a/testing/ticker/APKBUILD b/testing/ticker/APKBUILD
index 676735b664d967e4e80d71ddc0ca76558ff4c9fd..091b6c8ee8fc8fe7d010a153abc7a069f25049e0 100644
--- a/testing/ticker/APKBUILD
+++ b/testing/ticker/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=ticker
 pkgver=4.5.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Terminal stock watcher and stock position tracker"
 url="https://github.com/achannarasappa/ticker"
 arch="all"
@@ -38,7 +38,7 @@ package() {
 	install -Dm644 ticker.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/ticker
 	install -Dm644 ticker.fish \
-		"$pkgdir"/usr/share/fish/completions/ticker.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/ticker.fish
 	install -Dm644 ticker.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_ticker
 }
diff --git a/testing/topgrade/APKBUILD b/testing/topgrade/APKBUILD
index cc65f93e432cc0ab3200b3271c3b409aafc0c4ce..7d2263dee3f8af3b22733d87110d8799a2496e14 100644
--- a/testing/topgrade/APKBUILD
+++ b/testing/topgrade/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Sean McAvoy <seanmcavoy@gmail.com>
 pkgname=topgrade
 pkgver=12.0.0
-pkgrel=0
+pkgrel=1
 pkgdesc="run upgrades of packages in OS and other package managers"
 url="https://github.com/topgrade-rs/topgrade"
 arch="all !s390x !riscv64"
@@ -42,7 +42,7 @@ package() {
 	install -Dm644 LICENSE "$pkgdir"/usr/share/license/topgrade/LICENSE
 
 	install -Dm644 topgrade.bash "$pkgdir"/usr/share/bash-completion/completions/topgrade
-	install -Dm644 topgrade.fish "$pkgdir"/usr/share/fish/completions/topgrade.fish
+	install -Dm644 topgrade.fish "$pkgdir"/usr/share/fish/vendor_completions.d/topgrade.fish
 	install -Dm644 _topgrade "$pkgdir"/usr/share/zsh/site-functions/_topgrade
 
 	install -Dm644 config.example.toml "$pkgdir"/usr/share/doc/topgrade/config.example.toml
diff --git a/testing/vhs/APKBUILD b/testing/vhs/APKBUILD
index efaeb49cbc4b264ca0cd99ddbe4aa71e394e01dc..b28140df95bd0a9bf0102b7fde584be4e34a7dd2 100644
--- a/testing/vhs/APKBUILD
+++ b/testing/vhs/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Grigory Kirillov <txgk@bk.ru>
 pkgname=vhs
 pkgver=0.5.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool for automatic recording of terminal sessions"
 url="https://github.com/charmbracelet/vhs"
 arch="all"
@@ -43,7 +43,7 @@ package() {
 	install -Dm755 builddir/vhs "$pkgdir"/usr/bin/vhs
 	install -Dm644 builddir/vhs.1 "$pkgdir"/usr/share/man/man1/vhs.1
 	install -Dm644 completion.bash "$pkgdir"/usr/share/bash-completion/completions/vhs
-	install -Dm644 completion.fish "$pkgdir"/usr/share/fish/completions/vhs.fish
+	install -Dm644 completion.fish "$pkgdir"/usr/share/fish/vendor_completions.d/vhs.fish
 	install -Dm644 completion.zsh "$pkgdir"/usr/share/zsh/site-functions/_vhs
 }
 
diff --git a/testing/virtctl/APKBUILD b/testing/virtctl/APKBUILD
index 8c61cabecedf991aacdc45d16c6f0d4dff0b592c..91ed90e526a056e77c1ad75e6e8108d521f92e25 100644
--- a/testing/virtctl/APKBUILD
+++ b/testing/virtctl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=virtctl
 pkgver=0.59.0
-pkgrel=2
+pkgrel=3
 pkgdesc="CLI client for KubeVirt - the Kubernetes Virtualization API"
 url="https://kubevirt.io/"
 arch="all"
@@ -44,7 +44,7 @@ package() {
 	install -Dm644 $pkgname.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 	install -Dm644 $pkgname.fish \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 $pkgname.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
diff --git a/testing/wgcf/APKBUILD b/testing/wgcf/APKBUILD
index 96b107aa8243417a5896cc7c4a7220ab0476ffd8..b13306d52473a23f3993e7524575affaa1b9fbae 100644
--- a/testing/wgcf/APKBUILD
+++ b/testing/wgcf/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=wgcf
 pkgver=2.2.17
-pkgrel=0
+pkgrel=1
 pkgdesc="Unofficial CLI for Cloudflare Warp"
 url="https://github.com/ViRb3/wgcf"
 arch="all"
@@ -37,7 +37,7 @@ package() {
 	install -Dm644 wgcf.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/wgcf
 	install -Dm644 wgcf.fish \
-		"$pkgdir"/usr/share/fish/completions/wgcf.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/wgcf.fish
 	install -Dm644 wgcf.zsh \
 		"$pkgdir"/usr/share/zsh/site-functions/_wgcf
 }
diff --git a/testing/wpaperd/APKBUILD b/testing/wpaperd/APKBUILD
index 29daf41beac80cb35ec6dd9628aaca6808056d00..5b518babecdef6395bd2553cceecd803b6a93be9 100644
--- a/testing/wpaperd/APKBUILD
+++ b/testing/wpaperd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michał Polański <michal@polanski.me>
 pkgname=wpaperd
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Wallpaper daemon for Wayland"
 url="https://github.com/danyspin97/wpaperd"
 license="GPL-3.0-or-later"
@@ -41,7 +41,7 @@ package() {
 	install -Dm644 completions/$pkgname.bash \
 		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 	install -Dm644 completions/$pkgname.fish \
-		"$pkgdir"/usr/share/fish/completions/$pkgname.fish
+		"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 	install -Dm644 completions/_$pkgname \
 		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }