diff --git a/action.yml b/action.yml
index fe8f05906..30fc618ab 100644
--- a/action.yml
+++ b/action.yml
@@ -103,7 +103,7 @@ inputs:
     required: false
     default: '3.2.22'
   disable-locking:
-    description: Disable locking
+    description: Disable locking (deprecated, use pr_locks on digger.yml instead)
     required: false
     default: 'false'
   digger-filename:
diff --git a/backend/controllers/github.go b/backend/controllers/github.go
index aa4676efa..8c45688dd 100644
--- a/backend/controllers/github.go
+++ b/backend/controllers/github.go
@@ -511,7 +511,6 @@ func handlePullRequestEvent(gh utils.GithubClientProvider, payload *github.PullR
 	if config.PrLocks {
 		for _, project := range impactedProjects {
 			prLock := dg_locking.PullRequestLock{
-				Enable: config.PrLocks,
 				InternalLock: locking.BackendDBLock{
 					OrgId: organisationId,
 				},
@@ -794,7 +793,6 @@ func handleIssueCommentEvent(gh utils.GithubClientProvider, payload *github.Issu
 	if config.PrLocks {
 		for _, project := range impactedProjects {
 			prLock := dg_locking.PullRequestLock{
-				Enable: config.PrLocks,
 				InternalLock: locking.BackendDBLock{
 					OrgId: orgId,
 				},
diff --git a/cli/pkg/digger/digger.go b/cli/pkg/digger/digger.go
index 4af9d2dba..5dc849329 100644
--- a/cli/pkg/digger/digger.go
+++ b/cli/pkg/digger/digger.go
@@ -3,6 +3,7 @@ package digger
 import (
 	"errors"
 	"fmt"
+	comment_updater "github.com/diggerhq/digger/libs/comment_utils/summary"
 	coreutils "github.com/diggerhq/digger/libs/comment_utils/utils"
 	locking2 "github.com/diggerhq/digger/libs/locking"
 	"log"
@@ -204,7 +205,6 @@ func run(command string, job orchestrator.Job, policyChecker policy.Checker, org
 	}
 
 	projectLock := &locking2.PullRequestLock{
-		Enable:           config.PrLocks,
 		InternalLock:     lock,
 		Reporter:         reporter,
 		CIService:        prService,
diff --git a/cli/pkg/github/github.go b/cli/pkg/github/github.go
index c048f8b24..a8dc1a322 100644
--- a/cli/pkg/github/github.go
+++ b/cli/pkg/github/github.go
@@ -220,6 +220,11 @@ func GitHubCI(lock core_locking.Lock, policyChecker core_policy.Checker, backend
 	}
 	log.Printf("Digger digger_config read successfully\n")
 
+	if diggerConfig.PrLocks == false {
+		log.Printf("info: Using noop lock as configured in digger.yml")
+		lock = core_locking.NoOpLock{}
+	}
+
 	yamlData, err := yaml.Marshal(diggerConfigYaml)
 	if err != nil {
 		log.Fatalf("error: %v", err)
diff --git a/docs/getting-started/github-actions-+-aws.mdx b/docs/getting-started/github-actions-+-aws.mdx
index 46cc507f2..b40360fc2 100644
--- a/docs/getting-started/github-actions-+-aws.mdx
+++ b/docs/getting-started/github-actions-+-aws.mdx
@@ -75,7 +75,6 @@ jobs:
           setup-aws: true
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          disable-locking: true
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docs/getting-started/github-actions-and-gcp.mdx b/docs/getting-started/github-actions-and-gcp.mdx
index 1d8dfb3b8..8f972a80e 100644
--- a/docs/getting-started/github-actions-and-gcp.mdx
+++ b/docs/getting-started/github-actions-and-gcp.mdx
@@ -82,7 +82,6 @@ jobs:
         uses: diggerhq/digger@vLatest
         with:
           setup-aws: false
-          disable-locking: true
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docs/howto/disable-locking.mdx b/docs/howto/disable-locking.mdx
new file mode 100644
index 000000000..c7f3ab8a9
--- /dev/null
+++ b/docs/howto/disable-locking.mdx
@@ -0,0 +1,13 @@
+---
+title: "Disable locking"
+---
+
+In order to disable locking repo wide you can add a top-level flag to your digger.yml:
+
+```
+pr_locks: false
+
+projects:
+   - name: dev
+     dir: dev/
+```
\ No newline at end of file
diff --git a/docs/howto/multiacc-aws.mdx b/docs/howto/multiacc-aws.mdx
index 5fca20d24..1d7b8615d 100644
--- a/docs/howto/multiacc-aws.mdx
+++ b/docs/howto/multiacc-aws.mdx
@@ -81,7 +81,6 @@ jobs:
           setup-aws: true
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          disable-locking: true
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docs/mint.json b/docs/mint.json
index c85d89a9f..7f4be28a5 100644
--- a/docs/mint.json
+++ b/docs/mint.json
@@ -97,7 +97,8 @@
         "howto/using-infracost",
         "howto/using-opa-conftest",
         "howto/using-terragrunt",
-        "howto/versioning"
+        "howto/versioning",
+        "howto/disable-locking"
       ]
     },
     {
diff --git a/docs/reference/action-inputs.mdx b/docs/reference/action-inputs.mdx
index cd2a66bfb..45e8f1667 100644
--- a/docs/reference/action-inputs.mdx
+++ b/docs/reference/action-inputs.mdx
@@ -101,7 +101,7 @@ inputs:
     required: false
     default: '3.2.22'
   disable-locking:
-    description: Disable locking
+    description: Disable locking (deprecated, use pr_locks on digger.yml instead)
     required: false
     default: 'false'
   digger-filename:
diff --git a/libs/locking/locking.go b/libs/locking/locking.go
index 8016aa112..de0d7ee5d 100644
--- a/libs/locking/locking.go
+++ b/libs/locking/locking.go
@@ -25,7 +25,6 @@ import (
 )
 
 type PullRequestLock struct {
-	Enable           bool
 	InternalLock     Lock
 	CIService        orchestrator.PullRequestService
 	Reporter         reporting.Reporter
@@ -64,9 +63,6 @@ func (projectLock *PullRequestLock) Lock() (bool, error) {
 	}
 
 	var existingLockTransactionId *int
-	if projectLock.Enable {
-		existingLockTransactionId, err = projectLock.InternalLock.GetLock(lockId)
-	}
 
 	if err != nil {
 		log.Printf("failed to get lock: %v\n", err)