diff --git a/cmd/cephcsi.go b/cmd/cephcsi.go
index 6b7d6dfe1..c3983456c 100644
--- a/cmd/cephcsi.go
+++ b/cmd/cephcsi.go
@@ -30,7 +30,7 @@ import (
 	"github.com/ceph/ceph-csi/internal/rbd"
 	"github.com/ceph/ceph-csi/internal/util"
 
-	klog "k8s.io/klog/v2"
+	"k8s.io/klog/v2"
 )
 
 const (
diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
index 9dfea337c..d51bad24e 100644
--- a/e2e/e2e_test.go
+++ b/e2e/e2e_test.go
@@ -11,7 +11,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"k8s.io/kubernetes/test/e2e/framework"
-	config "k8s.io/kubernetes/test/e2e/framework/config"
+	"k8s.io/kubernetes/test/e2e/framework/config"
 )
 
 func init() {
diff --git a/internal/csi-common/driver.go b/internal/csi-common/driver.go
index 08d1b0a1d..a65a19252 100644
--- a/internal/csi-common/driver.go
+++ b/internal/csi-common/driver.go
@@ -22,7 +22,7 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	klog "k8s.io/klog/v2"
+	"k8s.io/klog/v2"
 
 	"github.com/ceph/ceph-csi/internal/util"
 )
diff --git a/internal/csi-common/nodeserver-default.go b/internal/csi-common/nodeserver-default.go
index 8f26626d3..97376da9a 100644
--- a/internal/csi-common/nodeserver-default.go
+++ b/internal/csi-common/nodeserver-default.go
@@ -27,7 +27,7 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	klog "k8s.io/klog/v2"
+	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/volume"
 )
 
diff --git a/internal/csi-common/server.go b/internal/csi-common/server.go
index b76d362b0..00b7bdb3b 100644
--- a/internal/csi-common/server.go
+++ b/internal/csi-common/server.go
@@ -29,7 +29,7 @@ import (
 	"github.com/kube-storage/spec/lib/go/replication"
 	"github.com/prometheus/client_golang/prometheus"
 	"google.golang.org/grpc"
-	klog "k8s.io/klog/v2"
+	"k8s.io/klog/v2"
 
 	"github.com/ceph/ceph-csi/internal/util"
 )
diff --git a/internal/csi-common/utils.go b/internal/csi-common/utils.go
index 5e2218486..8cc2f1bd4 100644
--- a/internal/csi-common/utils.go
+++ b/internal/csi-common/utils.go
@@ -30,7 +30,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	klog "k8s.io/klog/v2"
+	"k8s.io/klog/v2"
 )
 
 func parseEndpoint(ep string) (string, string, error) {
diff --git a/internal/util/log.go b/internal/util/log.go
index 7447ad35a..362c263e2 100644
--- a/internal/util/log.go
+++ b/internal/util/log.go
@@ -17,7 +17,7 @@ import (
 	"context"
 	"fmt"
 
-	klog "k8s.io/klog/v2"
+	"k8s.io/klog/v2"
 )
 
 // enum defining logging levels.