diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts
index 86e8b7c6b8..e06236d889 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts
@@ -106,7 +106,7 @@ describe('github:repo:create', () => {
       private: true,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
@@ -128,7 +128,7 @@ describe('github:repo:create', () => {
       private: false,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
@@ -151,7 +151,7 @@ describe('github:repo:create', () => {
       private: true,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
@@ -178,7 +178,7 @@ describe('github:repo:create', () => {
       private: true,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
@@ -200,7 +200,7 @@ describe('github:repo:create', () => {
       private: false,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
@@ -223,7 +223,7 @@ describe('github:repo:create', () => {
       private: true,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.ts
index 8de2dd2948..a4c4380fc3 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.ts
@@ -126,7 +126,7 @@ export function createGithubRepoCreateAction(options: {
         deleteBranchOnMerge = false,
         allowMergeCommit = true,
         allowSquashMerge = true,
-        squashMergeCommitTitle = 'PR_TITLE',
+        squashMergeCommitTitle = 'COMMIT_OR_PR_TITLE',
         squashMergeCommitMessage = 'COMMIT_MESSAGES',
         allowRebaseMerge = true,
         allowAutoMerge = false,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/inputProperties.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/inputProperties.ts
index 8b43fccd92..fc783d844e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/inputProperties.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/inputProperties.ts
@@ -91,7 +91,7 @@ const allowSquashMerge = {
 const squashMergeCommitTitle = {
   title: 'Default squash merge commit title',
   enum: ['PR_TITLE', 'COMMIT_OR_PR_TITLE'],
-  description: `Sets the default value for a squash merge commit title. The default value is 'PR_TITLE'`,
+  description: `Sets the default value for a squash merge commit title. The default value is 'COMMIT_OR_PR_TITLE'`,
 };
 const squashMergeCommitMessage = {
   title: 'Default squash merge commit message',
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
index fd06b699bb..0152ed7837 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
@@ -111,7 +111,7 @@ describe('publish:github', () => {
       private: true,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
@@ -133,7 +133,7 @@ describe('publish:github', () => {
       private: false,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
@@ -156,7 +156,7 @@ describe('publish:github', () => {
       private: true,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
@@ -183,7 +183,7 @@ describe('publish:github', () => {
       private: true,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
@@ -205,7 +205,7 @@ describe('publish:github', () => {
       private: false,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
@@ -228,7 +228,7 @@ describe('publish:github', () => {
       private: true,
       delete_branch_on_merge: false,
       allow_squash_merge: true,
-      squash_merge_commit_title: 'PR_TITLE',
+      squash_merge_commit_title: 'COMMIT_OR_PR_TITLE',
       squash_merge_commit_message: 'COMMIT_MESSAGES',
       allow_merge_commit: true,
       allow_rebase_merge: true,
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 2b6f81add6..0b7f036ff9 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -158,7 +158,7 @@ export function createPublishGithubAction(options: {
         gitAuthorEmail,
         allowMergeCommit = true,
         allowSquashMerge = true,
-        squashMergeCommitTitle = 'PR_TITLE',
+        squashMergeCommitTitle = 'COMMIT_OR_PR_TITLE',
         squashMergeCommitMessage = 'COMMIT_MESSAGES',
         allowRebaseMerge = true,
         allowAutoMerge = false,