diff --git a/internal/cmd/crew_add.go b/internal/cmd/crew_add.go
index 81e68253..39daaae1 100644
--- a/internal/cmd/crew_add.go
+++ b/internal/cmd/crew_add.go
@@ -88,7 +88,7 @@ func runCrewAdd(cmd *cobra.Command, args []string) error {
 			RoleType:   "crew",
 			Rig:        rigName,
 			AgentState: "idle",
-			RoleBead:   crewID + "-role",
+			RoleBead:   "gt-crew-role",
 		}
 		desc := fmt.Sprintf("Crew worker %s in %s - human-managed persistent workspace.", name, rigName)
 		if _, err := bd.CreateAgentBead(crewID, desc, fields); err != nil {
diff --git a/internal/polecat/manager.go b/internal/polecat/manager.go
index 195fdf2a..f57afb5f 100644
--- a/internal/polecat/manager.go
+++ b/internal/polecat/manager.go
@@ -221,6 +221,7 @@ func (m *Manager) Add(name string) (*Polecat, error) {
 		RoleType:   "polecat",
 		Rig:        m.rig.Name,
 		AgentState: "spawning",
+		RoleBead:   "gt-polecat-role",
 	})
 	if err != nil {
 		// Non-fatal - log warning but continue
@@ -427,6 +428,7 @@ func (m *Manager) Recreate(name string, force bool) (*Polecat, error) {
 		RoleType:   "polecat",
 		Rig:        m.rig.Name,
 		AgentState: "spawning",
+		RoleBead:   "gt-polecat-role",
 	})
 	if err != nil {
 		fmt.Printf("Warning: could not create agent bead: %v\n", err)