diff --git a/.golangci.yaml b/.golangci.yaml
index 17f6903bc..ebb6b2576 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -43,7 +43,7 @@ linters:
     - whitespace
     - copyloopvar
     - intrange
-    - fatcontext
+    # - fatcontext Starting in go@1.23.1 and golangci-lint@1.61.0 this gave a lot of false positives
     # - canonicalheader Can't do this one since it alerts on valid headers such as X-XSS-Protection
     - spancheck
     - importas
diff --git a/hack/lib/lint-version.txt b/hack/lib/lint-version.txt
index 8f16209d1..91951fd8a 100644
--- a/hack/lib/lint-version.txt
+++ b/hack/lib/lint-version.txt
@@ -1 +1 @@
-1.60.3
+1.61.0
diff --git a/internal/net/phttp/warning.go b/internal/net/phttp/warning.go
index 5cde35102..a7c16f0c6 100644
--- a/internal/net/phttp/warning.go
+++ b/internal/net/phttp/warning.go
@@ -40,7 +40,6 @@ func getWarningHandler() rest.WarningHandler {
 	// the client-go rest.WarningHandlers all log warnings with non-empty message and code=299, agent is ignored
 
 	// no deduplication or color output when running from a non-terminal such as a pod
-	//nolint:gosec // this is an int, cast to uintptr, cast back to int
 	if isTerm := term.IsTerminal(int(os.Stderr.Fd())); !isTerm {
 		return rest.WarningLogger{}
 	}
diff --git a/internal/upstreamoidc/upstreamoidc_test.go b/internal/upstreamoidc/upstreamoidc_test.go
index fbbe156bb..762e09de2 100644
--- a/internal/upstreamoidc/upstreamoidc_test.go
+++ b/internal/upstreamoidc/upstreamoidc_test.go
@@ -1461,7 +1461,7 @@ func forceUserInfoWithClaims(subject string, claims string) *coreosoidc.UserInfo
 
 	// this is some dark magic to set a private field
 	claimsField := reflect.ValueOf(userInfo).Elem().FieldByName("claims")
-	claimsPointer := (*[]byte)(unsafe.Pointer(claimsField.UnsafeAddr())) //nolint:gosec // this is a test hack we are willing to live with
+	claimsPointer := (*[]byte)(unsafe.Pointer(claimsField.UnsafeAddr()))
 	*claimsPointer = []byte(claims)
 
 	return userInfo
diff --git a/pkg/oidcclient/login.go b/pkg/oidcclient/login.go
index 53267d6c2..f1b7e6d71 100644
--- a/pkg/oidcclient/login.go
+++ b/pkg/oidcclient/login.go
@@ -75,7 +75,7 @@ const (
 )
 
 // stdin returns the file descriptor for stdin as an int.
-func stdin() int { return int(os.Stdin.Fd()) } //nolint:gosec // this is an int, cast to uintptr, cast back to int
+func stdin() int { return int(os.Stdin.Fd()) }
 
 type handlerState struct {
 	// Basic parameters.
diff --git a/test/integration/main_test.go b/test/integration/main_test.go
index d28e3527b..f3b5992aa 100644
--- a/test/integration/main_test.go
+++ b/test/integration/main_test.go
@@ -28,7 +28,7 @@ func TestMain(m *testing.M) {
 func splitIntegrationTestsIntoBuckets(m *testing.M) {
 	// this is some dark magic to set a private field
 	testsField := reflect.ValueOf(m).Elem().FieldByName("tests")
-	testsPointer := (*[]testing.InternalTest)(unsafe.Pointer(testsField.UnsafeAddr())) //nolint:gosec // this is a test hack we are willing to live with
+	testsPointer := (*[]testing.InternalTest)(unsafe.Pointer(testsField.UnsafeAddr()))
 
 	tests := *testsPointer