diff --git a/.gitignore b/.gitignore
index e928c3aba..a843addba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,6 @@ Thumbs.db
 
 # Test reports
 *-report.txt
+
+# Per-worktree golangci-lint cache
+/.cache/
diff --git a/Makefile b/Makefile
index 072560d7b..7f9726be9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,11 @@
 GO_PROJECT_NAME := spx
 SHELL := /bin/bash
 
+# golangci-lint's default cache (~/.cache/golangci-lint) is keyed by module
+# path, not worktree path, so parallel worktrees of this module collide and
+# surface each other's issues. Scope it per worktree.
+export GOLANGCI_LINT_CACHE := $(CURDIR)/.cache/golangci-lint
+
 # Detect architecture for cross-platform support
 ARCH := $(shell uname -m)
 ifeq ($(ARCH),x86_64)
diff --git a/spinifex/utils/images.go b/spinifex/utils/images.go
index 3e5e35c54..5343a595e 100644
--- a/spinifex/utils/images.go
+++ b/spinifex/utils/images.go
@@ -440,7 +440,7 @@ var AvailableImages = map[string]Images{
 	// tags — CreateNodegroup selects it for GPU instance types instead of the Alpine AMI.
 	"spinifex-eks-node-gpu": {
 		Name:         "spinifex-eks-node-gpu",
-		Description:  "Mulga EKS GPU node image — Ubuntu 26.04 + NVIDIA driver + K3s v1.32.5 + eks-token-webhook (server|agent role selected at first boot)",
+		Description:  "Mulga EKS GPU node image — Ubuntu 26.04 + NVIDIA driver + K3s v1.32.5, agent-only (GPU nodes never run the EKS control plane, so no role selector or eks-token-webhook)",
 		Distro:       "ubuntu",
 		Version:      "26.04",
 		Arch:         "x86_64",