diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f6d36906..e4242135 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -215,7 +215,7 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     env:
-      GOLANGCI_LINT_VERSION: v1.60.1
+      GOLANGCI_LINT_VERSION: v1.61.0
     permissions:
       contents: read
       # allow read access to pull request. Use with `only-new-issues` option.
diff --git a/client.go b/client.go
index 89509c07..a7dd4d23 100644
--- a/client.go
+++ b/client.go
@@ -733,7 +733,7 @@ func (c *Client[TTx]) Start(ctx context.Context) error {
 			}
 		}
 
-		c.queues.fetchCtx = fetchCtx
+		c.queues.fetchCtx = fetchCtx //nolint:fatcontext
 		c.queues.workCtx = workCtx
 		c.workCancel = workCancel
 
diff --git a/internal/notifier/notifier.go b/internal/notifier/notifier.go
index fe0e7c6c..843a2989 100644
--- a/internal/notifier/notifier.go
+++ b/internal/notifier/notifier.go
@@ -319,7 +319,7 @@ func (n *Notifier) listenerUnlisten(ctx context.Context, topic NotificationTopic
 func (n *Notifier) waitOnce(ctx context.Context) error {
 	n.withLock(func() {
 		n.isWaiting = true
-		ctx, n.waitCancel = context.WithCancel(ctx)
+		ctx, n.waitCancel = context.WithCancel(ctx) //nolint:fatcontext
 	})
 	defer n.withLock(func() {
 		n.isWaiting = false
diff --git a/job_list_params.go b/job_list_params.go
index ffdc39af..356cadda 100644
--- a/job_list_params.go
+++ b/job_list_params.go
@@ -327,7 +327,7 @@ func (p *JobListParams) First(count int) *JobListParams {
 		panic("count must be <= 10000")
 	}
 	paramsCopy := p.copy()
-	paramsCopy.paginationCount = int32(count) //nolint:gosec
+	paramsCopy.paginationCount = int32(count)
 	return paramsCopy
 }
 
diff --git a/queue_list_params.go b/queue_list_params.go
index a7753044..2f586bea 100644
--- a/queue_list_params.go
+++ b/queue_list_params.go
@@ -35,6 +35,6 @@ func (p *QueueListParams) First(count int) *QueueListParams {
 		panic("count must be <= 10000")
 	}
 	result := p.copy()
-	result.paginationCount = int32(count) //nolint:gosec
+	result.paginationCount = int32(count)
 	return result
 }
diff --git a/rivershared/levenshtein/levenshtein.go b/rivershared/levenshtein/levenshtein.go
index 141d4e5a..8a92c0ab 100644
--- a/rivershared/levenshtein/levenshtein.go
+++ b/rivershared/levenshtein/levenshtein.go
@@ -62,7 +62,7 @@ func ComputeDistance(str1, str2 string) int {
 
 	// we start from 1 because index 0 is already 0.
 	for i := 1; i < len(distances); i++ {
-		distances[i] = uint16(i)
+		distances[i] = uint16(i) //nolint:gosec
 	}
 
 	// Make a dummy bounds check to prevent the 2 bounds check down below. The
@@ -71,7 +71,7 @@ func ComputeDistance(str1, str2 string) int {
 
 	// fill in the rest
 	for i := 1; i <= lenRuneSlice2; i++ {
-		prev := uint16(i)
+		prev := uint16(i) //nolint:gosec
 		for j := 1; j <= lenRuneSlice1; j++ {
 			current := distances[j-1] // match
 			if runeSlice2[i-1] != runeSlice1[j-1] {
diff --git a/rivershared/levenshtein/levenshtein_test.go b/rivershared/levenshtein/levenshtein_test.go
index c842c640..a3cfbc1a 100644
--- a/rivershared/levenshtein/levenshtein_test.go
+++ b/rivershared/levenshtein/levenshtein_test.go
@@ -59,7 +59,7 @@ func TestUnicode(t *testing.T) {
 }
 
 // Benchmarks
-// ----------------------------------------------
+// ----------------------------------------------.
 var sink int //nolint:gochecknoglobals
 
 func BenchmarkSimple(b *testing.B) {
diff --git a/rivershared/startstop/start_stop_test.go b/rivershared/startstop/start_stop_test.go
index 47823c86..18101991 100644
--- a/rivershared/startstop/start_stop_test.go
+++ b/rivershared/startstop/start_stop_test.go
@@ -198,7 +198,7 @@ func TestErrStop(t *testing.T) {
 			return nil
 		}
 
-		workCtx = ctx
+		workCtx = ctx //nolint:fatcontext
 
 		go func() {
 			started()