diff --git a/.conform.yaml b/.conform.yaml
index 1ed57af..e4500c9 100644
--- a/.conform.yaml
+++ b/.conform.yaml
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2025-08-05T07:50:25Z by kres 95bf7d7-dirty.
+# Generated on 2025-11-13T12:17:44Z by kres 1ad287b.
 
 policies:
   - type: commit
@@ -12,7 +12,7 @@ policies:
           gitHubOrganization: siderolabs
       spellcheck:
         locale: US
-      maximumOfOneCommit: true
+      maximumOfOneCommit: false
       header:
         length: 89
         imperative: true
diff --git a/Dockerfile b/Dockerfile
index 2b82dca..b11a180 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2025-11-07T08:50:34Z by kres 4ba9b0c-dirty.
+# Generated on 2025-11-13T12:17:44Z by kres 1ad287b.
 
 ARG TOOLCHAIN=scratch
 
diff --git a/Makefile b/Makefile
index 2d72f13..5b768c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2025-11-07T08:50:34Z by kres 4ba9b0c-dirty.
+# Generated on 2025-11-13T12:17:44Z by kres 1ad287b.
 
 # common variables
 
diff --git a/internal/project/common/repository.go b/internal/project/common/repository.go
index 2aa155e..03485ec 100644
--- a/internal/project/common/repository.go
+++ b/internal/project/common/repository.go
@@ -85,7 +85,7 @@ func NewRepository(meta *meta.Options) *Repository {
 		},
 		ConformLicenseCheck:       true,
 		ConformGPGSignatureCheck:  true,
-		ConformMaximumOfOneCommit: true,
+		ConformMaximumOfOneCommit: false,
 
 		Licenses: []LicenseConfig{
 			{
@@ -212,10 +212,13 @@ func (r *Repository) enableBranchProtection(client *github.Client) error {
 			"conform/commit/header-last-character",
 			"conform/commit/header-length",
 			"conform/commit/imperative-mood",
-			"conform/commit/number-of-commits",
 			"conform/commit/spellcheck",
 		)
 
+		if r.ConformMaximumOfOneCommit {
+			enforceContexts = append(enforceContexts, "conform/commit/number-of-commits")
+		}
+
 		if r.ConformLicenseCheck {
 			enforceContexts = append(enforceContexts,
 				"conform/license/file-header",