diff --git a/app-admin/vault/vault-1.15.6.ebuild b/app-admin/vault/vault-1.15.6.ebuild
index 0d3c950161cf9..c03a504df9666 100644
--- a/app-admin/vault/vault-1.15.6.ebuild
+++ b/app-admin/vault/vault-1.15.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,28 +12,32 @@ VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
 SRC_URI="https://github.com/hashicorp/vault/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" webui? ( https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} )"
 SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+S=${WORKDIR}/${P}
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="+webui"
 
+DEPEND="
+	acct-group/vault
+	acct-user/vault
+"
+RDEPEND="${DEPEND}"
 BDEPEND="
 	app-arch/zip
 	dev-go/gox
-	>=dev-lang/go-1.21"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
+	<dev-lang/go-1.27
+"
 
 FILECAPS=(
 	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
 )
 
 RESTRICT="test"
-S=${WORKDIR}/${P}
-PATCHES=("${FILESDIR}/${P}-stubmaker-outside-git-repo-24678.patch")
+PATCHES=(
+	"${FILESDIR}/${P}-stubmaker-outside-git-repo-24678.patch"
+)
 
 src_unpack() {
 	default
diff --git a/app-admin/vault/vault-1.18.3.ebuild b/app-admin/vault/vault-1.18.3.ebuild
index 8d7997070c9d2..b715f597a855b 100644
--- a/app-admin/vault/vault-1.18.3.ebuild
+++ b/app-admin/vault/vault-1.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,15 +19,17 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="+webui"
 
+DEPEND="
+	acct-group/vault
+	acct-user/vault
+"
+RDEPEND="${DEPEND}"
 BDEPEND="
 	app-arch/zip
 	dev-go/enumer
 	dev-go/gox
-	>=dev-lang/go-1.21"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
+	<dev-lang/go-1.27
+"
 
 FILECAPS=(
 	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
diff --git a/app-admin/vault/vault-1.18.4.ebuild b/app-admin/vault/vault-1.18.4.ebuild
index c77648c833283..b715f597a855b 100644
--- a/app-admin/vault/vault-1.18.4.ebuild
+++ b/app-admin/vault/vault-1.18.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,15 +19,17 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="+webui"
 
+DEPEND="
+	acct-group/vault
+	acct-user/vault
+"
+RDEPEND="${DEPEND}"
 BDEPEND="
 	app-arch/zip
-	>=dev-go/enumer-1.5.11
+	dev-go/enumer
 	dev-go/gox
-	>=dev-lang/go-1.21"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
+	<dev-lang/go-1.27
+"
 
 FILECAPS=(
 	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}