diff --git a/cmd/cephfs/main.go b/cmd/cephfs/main.go
index 3f7e5694f..d152ae093 100644
--- a/cmd/cephfs/main.go
+++ b/cmd/cephfs/main.go
@@ -26,13 +26,6 @@ import (
 	"k8s.io/klog"
 )
 
-func init() {
-	if err := flag.Set("logtostderr", "true"); err != nil {
-		klog.Errorf("failed to set logtostderr flag: %v", err)
-		os.Exit(1)
-	}
-}
-
 var (
 	endpoint        = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
 	driverName      = flag.String("drivername", "csi-cephfsplugin", "name of the driver")
@@ -42,8 +35,27 @@ var (
 )
 
 func main() {
+	if err := flag.Set("logtostderr", "true"); err != nil {
+		klog.Errorf("failed to set logtostderr flag: %v", err)
+		os.Exit(1)
+	}
+
 	flag.Parse()
 
+	// TODO: remove this once github.com/kubernetes-csi/drivers/pkg/csi-common pkg moves to klog
+	klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(klogFlags)
+
+	// Sync klog flags with glog
+	flag.CommandLine.VisitAll(func(f1 *flag.Flag) {
+		if f2 := klogFlags.Lookup(f1.Name); f2 != nil {
+			if err := f2.Value.Set(f1.Value.String()); err != nil {
+				klog.Errorf("failed to set %s flag: %v", f1.Name, err)
+				os.Exit(1)
+			}
+		}
+	})
+
 	if err := createPersistentStorage(path.Join(cephfs.PluginFolder, "controller")); err != nil {
 		klog.Errorf("failed to create persistent storage for controller: %v", err)
 		os.Exit(1)
diff --git a/cmd/rbd/main.go b/cmd/rbd/main.go
index 5dd239fa9..4e6edbb37 100644
--- a/cmd/rbd/main.go
+++ b/cmd/rbd/main.go
@@ -26,13 +26,6 @@ import (
 	"k8s.io/klog"
 )
 
-func init() {
-	if err := flag.Set("logtostderr", "true"); err != nil {
-		klog.Errorf("failed to set logtostderr flag: %v", err)
-		os.Exit(1)
-	}
-}
-
 var (
 	endpoint        = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
 	driverName      = flag.String("drivername", "csi-rbdplugin", "name of the driver")
@@ -42,8 +35,27 @@ var (
 )
 
 func main() {
+	if err := flag.Set("logtostderr", "true"); err != nil {
+		klog.Errorf("failed to set logtostderr flag: %v", err)
+		os.Exit(1)
+	}
+
 	flag.Parse()
 
+	// TODO: remove this once github.com/kubernetes-csi/drivers/pkg/csi-common pkg moves to klog
+	klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(klogFlags)
+
+	// Sync klog flags with glog
+	flag.CommandLine.VisitAll(func(f1 *flag.Flag) {
+		if f2 := klogFlags.Lookup(f1.Name); f2 != nil {
+			if err := f2.Value.Set(f1.Value.String()); err != nil {
+				klog.Errorf("failed to set %s flag: %v", f1.Name, err)
+				os.Exit(1)
+			}
+		}
+	})
+
 	if err := createPersistentStorage(path.Join(rbd.PluginFolder, "controller")); err != nil {
 		klog.Errorf("failed to create persistent storage for controller %v", err)
 		os.Exit(1)