diff --git a/.golangci.yaml b/.golangci.yaml
index 8c54aa95b166..b79136efe3e7 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -4,19 +4,12 @@ run:
 
   timeout: 5m
 
-  skip-dirs:
-    - tools
-    - website
-    - hack
-    - charts
-    - designs
-
 linters:
   enable:
     - asciicheck
     - bidichk
     - errorlint
-    - exportloopref
+    - copyloopvar
     - gosec
     - revive
     - stylecheck
@@ -36,7 +29,7 @@ linters-settings:
   gocyclo:
     min-complexity: 11
   govet:
-    check-shadowing: true
+    shadow: true
   revive:
     rules:
     - name: dot-imports
@@ -66,6 +59,12 @@ linters-settings:
 issues:
   fix: true
   exclude: ['declaration of "(err|ctx)" shadows declaration at']
+  exclude-dirs:
+  - tools
+  - website
+  - hack
+  - charts
+  - designs
   exclude-rules:
   - linters:
     - goheader
diff --git a/pkg/providers/instancetype/suite_test.go b/pkg/providers/instancetype/suite_test.go
index 41ef6c8d20c1..7c47be3448e0 100644
--- a/pkg/providers/instancetype/suite_test.go
+++ b/pkg/providers/instancetype/suite_test.go
@@ -2323,7 +2323,6 @@ func generateSpotPricing(cp *cloudprovider.CloudProvider, nodePool *corev1beta1.
 			}
 		}
 		for _, o := range instanceType.Offerings {
-			o := o
 			if o.CapacityType != corev1beta1.CapacityTypeSpot {
 				continue
 			}
diff --git a/test/pkg/environment/common/monitor.go b/test/pkg/environment/common/monitor.go
index ab92f2c91ccf..1633105c3fe7 100644
--- a/test/pkg/environment/common/monitor.go
+++ b/test/pkg/environment/common/monitor.go
@@ -133,7 +133,6 @@ func (m *Monitor) DeletedNodes() []*v1.Node {
 func (m *Monitor) PendingPods(selector labels.Selector) []*v1.Pod {
 	var pods []*v1.Pod
 	for _, pod := range m.poll().pods.Items {
-		pod := pod
 		if pod.Status.Phase != v1.PodPending {
 			continue
 		}
@@ -152,7 +151,6 @@ func (m *Monitor) PendingPodsCount(selector labels.Selector) int {
 func (m *Monitor) RunningPods(selector labels.Selector) []*v1.Pod {
 	var pods []*v1.Pod
 	for _, pod := range m.poll().pods.Items {
-		pod := pod
 		if pod.Status.Phase != v1.PodRunning {
 			continue
 		}