diff --git a/cmd/charger.go b/cmd/charger.go
index ae6c2f9cb..f29351aea 100644
--- a/cmd/charger.go
+++ b/cmd/charger.go
@@ -45,7 +45,7 @@ func runCharger(cmd *cobra.Command, args []string) {
 	}
 
 	var phases int
-	if flag := cmd.Flags().Lookup(flagPhases); flag.Changed {
+	if flag := cmd.Flag(flagPhases); flag.Changed {
 		var err error
 		phases, err = strconv.Atoi(flag.Value.String())
 		if err != nil {
@@ -57,7 +57,7 @@ func runCharger(cmd *cobra.Command, args []string) {
 
 	var flagUsed bool
 	for _, v := range config.Instances(chargers) {
-		if flag := cmd.Flags().Lookup(flagCurrent); flag.Changed {
+		if flag := cmd.Flag(flagCurrent); flag.Changed {
 			flagUsed = true
 
 			current, err := strconv.ParseFloat(flag.Value.String(), 64)
@@ -76,7 +76,7 @@ func runCharger(cmd *cobra.Command, args []string) {
 			}
 		}
 
-		if cmd.Flags().Lookup(flagEnable).Changed {
+		if cmd.Flag(flagEnable).Changed {
 			flagUsed = true
 
 			if err := v.Enable(true); err != nil {
@@ -84,7 +84,7 @@ func runCharger(cmd *cobra.Command, args []string) {
 			}
 		}
 
-		if cmd.Flags().Lookup(flagDisable).Changed {
+		if cmd.Flag(flagDisable).Changed {
 			flagUsed = true
 
 			if err := v.Enable(false); err != nil {
@@ -92,7 +92,7 @@ func runCharger(cmd *cobra.Command, args []string) {
 			}
 		}
 
-		if cmd.Flags().Lookup(flagWakeup).Changed {
+		if cmd.Flag(flagWakeup).Changed {
 			flagUsed = true
 
 			if vv, ok := v.(api.Resurrector); ok {
@@ -119,7 +119,7 @@ func runCharger(cmd *cobra.Command, args []string) {
 
 	if !flagUsed {
 		d := dumper{len: len(chargers)}
-		flag := cmd.Flags().Lookup(flagDiagnose).Changed
+		flag := cmd.Flag(flagDiagnose).Changed
 
 		for _, dev := range chargers {
 			v := dev.Instance()
diff --git a/cmd/charger_ramp.go b/cmd/charger_ramp.go
index 4bcef1d6e..61d3e7d36 100644
--- a/cmd/charger_ramp.go
+++ b/cmd/charger_ramp.go
@@ -79,12 +79,12 @@ func runChargerRamp(cmd *cobra.Command, args []string) {
 		log.FATAL.Fatal(err)
 	}
 
-	digits, err := strconv.Atoi(cmd.Flags().Lookup(flagDigits).Value.String())
+	digits, err := strconv.Atoi(cmd.Flag(flagDigits).Value.String())
 	if err != nil {
 		log.ERROR.Fatalln(err)
 	}
 
-	delay, err := time.ParseDuration(cmd.Flags().Lookup(flagDelay).Value.String())
+	delay, err := time.ParseDuration(cmd.Flag(flagDelay).Value.String())
 	if err != nil {
 		log.ERROR.Fatalln(err)
 	}
diff --git a/cmd/flags.go b/cmd/flags.go
index 6f5b36364..58273a335 100644
--- a/cmd/flags.go
+++ b/cmd/flags.go
@@ -59,7 +59,7 @@ func bind(cmd *cobra.Command, key string, flagName ...string) {
 	if len(flagName) == 1 {
 		name = flagName[0]
 	}
-	if err := viper.BindPFlag(key, cmd.Flags().Lookup(name)); err != nil {
+	if err := viper.BindPFlag(key, cmd.Flag(name)); err != nil {
 		panic(err)
 	}
 }
diff --git a/cmd/meter.go b/cmd/meter.go
index 6ccf9bcfa..c61b752ab 100644
--- a/cmd/meter.go
+++ b/cmd/meter.go
@@ -39,7 +39,7 @@ func runMeter(cmd *cobra.Command, args []string) {
 	}
 
 	mode := api.BatteryUnknown
-	if val := cmd.Flags().Lookup(flagBatteryMode).Value.String(); val != "" {
+	if val := cmd.Flag(flagBatteryMode).Value.String(); val != "" {
 		var err error
 		mode, err = api.BatteryModeString(val)
 		if err != nil {
diff --git a/cmd/migrate.go b/cmd/migrate.go
index d4d71bc4b..ccbf98ffc 100644
--- a/cmd/migrate.go
+++ b/cmd/migrate.go
@@ -32,7 +32,7 @@ func runMigrate(cmd *cobra.Command, args []string) {
 		log.FATAL.Fatal(err)
 	}
 
-	reset := cmd.Flags().Lookup(flagReset).Changed
+	reset := cmd.Flag(flagReset).Changed
 
 	// TODO remove yaml file
 	if reset {
diff --git a/cmd/ocpp/main.go b/cmd/ocpp/main.go
index 80a0558f9..df40c88ff 100644
--- a/cmd/ocpp/main.go
+++ b/cmd/ocpp/main.go
@@ -37,7 +37,7 @@ func main() {
 }
 
 func runOcpp(cmd *cobra.Command, args []string) {
-	url := cmd.Flags().Lookup("uri").Value.String()
+	url := cmd.Flag("uri").Value.String()
 
 	if len(args) > 0 {
 		chargePointId = args[0]
diff --git a/cmd/setup.go b/cmd/setup.go
index f7dd80aa7..994553815 100644
--- a/cmd/setup.go
+++ b/cmd/setup.go
@@ -469,7 +469,7 @@ func configureSponsorship(token string) (err error) {
 
 func configureEnvironment(cmd *cobra.Command, conf *globalconfig.All) (err error) {
 	// full http request log
-	if cmd.Flags().Lookup(flagHeaders).Changed {
+	if cmd.Flag(flagHeaders).Changed {
 		request.LogHeaders = true
 	}
 
diff --git a/cmd/vehicle.go b/cmd/vehicle.go
index 736ccf92d..321b42912 100644
--- a/cmd/vehicle.go
+++ b/cmd/vehicle.go
@@ -38,7 +38,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
 	}
 
 	// use cloud
-	if cmd.Flags().Lookup(flagCloud).Changed {
+	if cmd.Flag(flagCloud).Changed {
 		for _, conf := range conf.Vehicles {
 			conf.Other["cloud"] = "true"
 		}
@@ -52,7 +52,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
 
 	var flagUsed bool
 	for _, v := range config.Instances(vehicles) {
-		if flag := cmd.Flags().Lookup(flagCurrent); flag.Changed {
+		if flag := cmd.Flag(flagCurrent); flag.Changed {
 			flagUsed = true
 
 			f, err := strconv.ParseFloat(flag.Value.String(), 64)
@@ -73,7 +73,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
 			}
 		}
 
-		if cmd.Flags().Lookup(flagWakeup).Changed {
+		if cmd.Flag(flagWakeup).Changed {
 			flagUsed = true
 
 			if vv, ok := v.(api.Resurrector); ok {
@@ -85,7 +85,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
 			}
 		}
 
-		if cmd.Flags().Lookup(flagStart).Changed {
+		if cmd.Flag(flagStart).Changed {
 			flagUsed = true
 
 			if vv, ok := v.(api.ChargeController); ok {
@@ -97,7 +97,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
 			}
 		}
 
-		if cmd.Flags().Lookup(flagStop).Changed {
+		if cmd.Flag(flagStop).Changed {
 			flagUsed = true
 
 			if vv, ok := v.(api.ChargeController); ok {
@@ -112,7 +112,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
 
 	if !flagUsed {
 		d := dumper{len: len(vehicles)}
-		flag := cmd.Flags().Lookup(flagDiagnose).Changed
+		flag := cmd.Flag(flagDiagnose).Changed
 
 		for _, dev := range vehicles {
 			v := dev.Instance()