diff --git a/cmd/geth/config.go b/cmd/geth/config.go
index 2e2c189fd5af..25a04254291b 100644
--- a/cmd/geth/config.go
+++ b/cmd/geth/config.go
@@ -146,6 +146,9 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
 	}
 	utils.SetShhConfig(ctx, stack)
 
+	// Set Bor config flags
+	utils.SetBorConfig(ctx, &cfg.Eth)
+
 	return stack, cfg
 }
 
diff --git a/cmd/utils/bor_flags.go b/cmd/utils/bor_flags.go
index 53e2969eebeb..22e1b33d3e64 100644
--- a/cmd/utils/bor_flags.go
+++ b/cmd/utils/bor_flags.go
@@ -52,6 +52,12 @@ func getGenesis(genesisPath string) (*core.Genesis, error) {
 	return genesis, nil
 }
 
+// SetBorConfig sets bor config
+func SetBorConfig(ctx *cli.Context, cfg *eth.Config) {
+	cfg.HeimdallURL = ctx.GlobalString(HeimdallURLFlag.Name)
+	cfg.WithoutHeimdall = ctx.GlobalBool(WithoutHeimdallFlag.Name)
+}
+
 // CreateBorEthereum Creates bor ethereum object from eth.Config
 func CreateBorEthereum(cfg *eth.Config) *eth.Ethereum {
 	workspace, err := ioutil.TempDir("", "bor-command-node-")