diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index b50b14f..7d2ae10 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -29,7 +29,8 @@ jobs:
     name: CD
     uses: grafana/plugin-ci-workflows/.github/workflows/cd.yml@main
     with:
-      golangci-lint-version: '1.64.6'
+      golangci-lint-version: '2.4.0'
+      go-version: '1.25'
       branch: ${{ github.event.inputs.branch }}
       environment: ${{ github.event.inputs.environment }}
       docs-only: ${{ fromJSON(github.event.inputs.docs-only) }}
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
index 78fc361..f5e2706 100644
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -16,6 +16,7 @@ jobs:
     name: CI
     uses: grafana/plugin-ci-workflows/.github/workflows/ci.yml@main
     with:
-      golangci-lint-version: '1.64.6'
+      golangci-lint-version: '2.4.0'
+      go-version: '1.25'
       plugin-version-suffix: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || '' }}
       run-playwright: true
diff --git a/go.mod b/go.mod
index 6941032..febe84e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/mqtt-datasource
 
-go 1.24.6
+go 1.25
 
 require (
 	github.com/eclipse/paho.mqtt.golang v1.5.0
diff --git a/pkg/mqtt/client_test.go b/pkg/mqtt/client_test.go
index 1d448c3..3fa18d2 100644
--- a/pkg/mqtt/client_test.go
+++ b/pkg/mqtt/client_test.go
@@ -166,7 +166,7 @@ func TestClient_Subscribe_Deduplication(t *testing.T) {
 
 	// Verify only one topic is stored
 	count := 0
-	c.topics.Map.Range(func(key, value interface{}) bool {
+	c.topics.Range(func(key, value any) bool {
 		count++
 		return true
 	})
@@ -199,7 +199,7 @@ func TestClient_Subscribe_MultipleStreamingKeys(t *testing.T) {
 
 	// Verify all three topics are stored separately
 	count := 0
-	c.topics.Map.Range(func(key, value interface{}) bool {
+	c.topics.Range(func(key, value any) bool {
 		count++
 		return true
 	})