diff --git a/x11-terms/alacritty/alacritty-0.15.1.ebuild b/x11-terms/alacritty/alacritty-0.15.1.ebuild
index c77798b9a2716..0134f1e124b81 100644
--- a/x11-terms/alacritty/alacritty-0.15.1.ebuild
+++ b/x11-terms/alacritty/alacritty-0.15.1.ebuild
@@ -285,7 +285,7 @@ MY_PV="${PV//_rc/-rc}"
 
 RUST_MIN_VER="1.74.1"
 
-inherit bash-completion-r1 cargo desktop
+inherit cargo desktop shell-completion
 
 DESCRIPTION="GPU-accelerated terminal emulator"
 HOMEPAGE="https://alacritty.org"
@@ -378,11 +378,9 @@ src_install() {
 
 	newbashcomp extra/completions/alacritty.bash alacritty
 
-	insinto /usr/share/fish/vendor_completions.d/
-	doins extra/completions/alacritty.fish
+	dofishcomp extra/completions/alacritty.fish
 
-	insinto /usr/share/zsh/site-functions
-	doins extra/completions/_alacritty
+	dozshcomp extra/completions/_alacritty
 
 	domenu extra/linux/Alacritty.desktop
 	newicon extra/logo/compat/alacritty-term.svg Alacritty.svg
diff --git a/x11-terms/alacritty/alacritty-9999.ebuild b/x11-terms/alacritty/alacritty-9999.ebuild
index 9db259027ce08..bdc643753be87 100644
--- a/x11-terms/alacritty/alacritty-9999.ebuild
+++ b/x11-terms/alacritty/alacritty-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2024 Gentoo Authors
+# Copyright 2017-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ MY_PV="${PV//_rc/-rc}"
 
 RUST_MIN_VER="1.74.1"
 
-inherit bash-completion-r1 cargo desktop
+inherit cargo desktop shell-completion
 
 DESCRIPTION="GPU-accelerated terminal emulator"
 HOMEPAGE="https://alacritty.org"
@@ -100,11 +100,9 @@ src_install() {
 
 	newbashcomp extra/completions/alacritty.bash alacritty
 
-	insinto /usr/share/fish/vendor_completions.d/
-	doins extra/completions/alacritty.fish
+	dofishcomp extra/completions/alacritty.fish
 
-	insinto /usr/share/zsh/site-functions
-	doins extra/completions/_alacritty
+	dozshcomp extra/completions/_alacritty
 
 	domenu extra/linux/Alacritty.desktop
 	newicon extra/logo/compat/alacritty-term.svg Alacritty.svg