diff --git a/app-containers/incus/files/incus-6.14.service b/app-containers/incus/files/incus-6.14-r1.service
similarity index 92%
rename from app-containers/incus/files/incus-6.14.service
rename to app-containers/incus/files/incus-6.14-r1.service
index dc9a3385fe524..e356a9e6d7006 100644
--- a/app-containers/incus/files/incus-6.14.service
+++ b/app-containers/incus/files/incus-6.14-r1.service
@@ -9,7 +9,7 @@ ExecStartPost=/usr/sbin/incusd waitready --timeout=600
 ExecStartPre=/bin/mkdir -p /var/log/incus
 ExecStartPre=/bin/chown -R root:incus-admin /var/log/incus
 KillMode=process
-PassEnvironment=INCUS_AGENT_PATH INCUS_EDK2_PATH
+EnvironmentFile=/etc/env.d/90incus
 PermissionsStartOnly=true
 TimeoutStartSec=600s
 TimeoutStopSec=30s
diff --git a/app-containers/incus/incus-6.14-r3.ebuild b/app-containers/incus/incus-6.14-r4.ebuild
similarity index 99%
rename from app-containers/incus/incus-6.14-r3.ebuild
rename to app-containers/incus/incus-6.14-r4.ebuild
index 735251e517b36..1d5e859cd2f8b 100644
--- a/app-containers/incus/incus-6.14-r3.ebuild
+++ b/app-containers/incus/incus-6.14-r4.ebuild
@@ -116,7 +116,7 @@ src_prepare() {
 		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
 		internal/server/instance/drivers/edk2/driver_edk2.go || die "Failed to fix hardcoded ovmf paths."
 
-	cp "${FILESDIR}"/incus-6.14.service "${T}"/incus.service || die
+	cp "${FILESDIR}"/incus-6.14-r1.service "${T}"/incus.service || die
 	if use apparmor; then
 		sed -i \
 			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \