diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
index 1e343c0799..7b6abdde10 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -313,7 +313,7 @@ export function createPublishGithubAction(options: {
                 username: collaborator.username,
                 permission: collaborator.access,
               });
-            } else {
+            } else if (collaborator.team) {
               await client.rest.teams.addOrUpdateRepoPermissionsInOrg({
                 org: owner,
                 team_slug: collaborator.team,
@@ -325,7 +325,7 @@ export function createPublishGithubAction(options: {
           } catch (e) {
             assertError(e);
             ctx.logger.warn(
-              `Skipping ${collaborator.access} access for ${collaborator.team}, ${e.message}`,
+              `Skipping ${collaborator.access} access for ${collaborator.username ?? collaborator.team}, ${e.message}`,
             );
           }
         }