diff --git a/.golangci.yml b/.golangci.yml
index aaf21dd5..cab089b1 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -12,44 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+version: "2"
+
+# timeout for analysis
+timeout: 5m
 linters:
-  disable-all: true
+  default: none
   enable:
+    - errcheck
     - goconst
-    - gofmt
-    - revive
-    - gosimple
+    - gocritic
+    - govet
     - ineffassign
     - misspell
     - staticcheck
     - unconvert
     - govet
     - unused
-    - errcheck
-    - typecheck
-    - gocritic
-    - gci
 
-run:
-
-  # timeout for analysis
-  timeout: 5m
-
-linters-settings:
-  gci:
-    sections:
-      - standard
-      - prefix(github.com/v3io/scaler)
-      - default
-      - blank
-      - dot
-
-    custom-order: true
-
-issues:
-
-  # List of regexps of issue texts to exclude
-  exclude:
-    - "comment on"
-    - "error should be the last"
-    - "should have comment"
+formatters:
+  enable:
+    - gci
+    - gofmt
+  settings:
+    gci:
+      sections:
+        - standard
+        - prefix(github.com/v3io/scaler)
+        - default
+        - blank
+        - dot
+      custom-order: true
diff --git a/Makefile b/Makefile
index 20c4f240..1432f2c4 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ push-docker-images:
 
 # tools get built with the specified OS/arch and inject version
 GO_BUILD_TOOL_WORKDIR = /scaler
-GOLANGCI_LINT_VERSION := v1.64.6
+GOLANGCI_LINT_VERSION := v2.7.2
 
 .PHONY: lint
 lint: modules
diff --git a/cmd/autoscaler/Dockerfile b/cmd/autoscaler/Dockerfile
index bdc17db0..4e9bc837 100644
--- a/cmd/autoscaler/Dockerfile
+++ b/cmd/autoscaler/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-FROM gcr.io/iguazio/golang:1.23.8-alpine AS builder
+FROM gcr.io/iguazio/golang:1.25-alpine AS builder
 
 RUN apk --update --no-cache add \
     git \
diff --git a/cmd/dlx/Dockerfile b/cmd/dlx/Dockerfile
index da887e5d..07492e3a 100644
--- a/cmd/dlx/Dockerfile
+++ b/cmd/dlx/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-FROM gcr.io/iguazio/golang:1.23.8-alpine AS builder
+FROM gcr.io/iguazio/golang:1.25-alpine AS builder
 
 RUN apk --update --no-cache add \
     git \
diff --git a/go.mod b/go.mod
index 2daca8ba..9c4c54df 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/v3io/scaler
 
-go 1.23.8
+go 1.25.5
 
 require (
 	github.com/dghubble/trie v0.1.0
diff --git a/test/Dockerfile b/test/Dockerfile
index 8e78554b..d36fe03c 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-FROM gcr.io/iguazio/golang:1.23.8
+FROM gcr.io/iguazio/golang:1.25
 
 ARG DOCKER_CLI_VERSION="28.0.4"