diff --git a/builder/files/config.toml b/builder/files/config.toml
index 0d01f85d71..8f70f62a13 100644
--- a/builder/files/config.toml
+++ b/builder/files/config.toml
@@ -78,8 +78,7 @@ syncmode = "full"
     # prefix = ""
     # host = "localhost"
     # api = ["web3", "net"]
-    # vhosts = ["*"]
-    # corsdomain = ["*"]
+    # origins = ["*"]
   # [jsonrpc.graphql]
     # enabled = false
     # port = 0
diff --git a/docs/cli/server.md b/docs/cli/server.md
index 5fe440b5fd..d52b135fa3 100644
--- a/docs/cli/server.md
+++ b/docs/cli/server.md
@@ -80,6 +80,8 @@ The ```bor server``` command runs the Bor client.
 
 - ```cache.preimages```: Enable recording the SHA3/keccak preimages of trie keys
 
+- ```cache.triesinmemory```: Number of block states (tries) to keep in memory (default = 128)
+
 - ```txlookuplimit```: Number of recent blocks to maintain transactions index for (default = about 56 days, 0 = entire chain)
 
 ### JsonRPC Options
@@ -96,9 +98,7 @@ The ```bor server``` command runs the Bor client.
 
 - ```http.vhosts```: Comma separated list of virtual hostnames from which to accept requests (server enforced). Accepts '*' wildcard.
 
-- ```ws.corsdomain```: Comma separated list of domains from which to accept cross origin requests (browser enforced)
-
-- ```ws.vhosts```: Comma separated list of virtual hostnames from which to accept requests (server enforced). Accepts '*' wildcard.
+- ```ws.origins```: Origins from which to accept websockets requests
 
 - ```graphql.corsdomain```: Comma separated list of domains from which to accept cross origin requests (browser enforced)
 
diff --git a/internal/cli/server/config.go b/internal/cli/server/config.go
index 86b611ac78..7070afca24 100644
--- a/internal/cli/server/config.go
+++ b/internal/cli/server/config.go
@@ -263,6 +263,9 @@ type APIConfig struct {
 
 	// Cors is the list of Cors endpoints
 	Cors []string `hcl:"corsdomain,optional" toml:"corsdomain,optional"`
+
+	// Origins is the list of endpoints to accept requests from (only consumed for websockets)
+	Origins []string `hcl:"origins,optional" toml:"origins,optional"`
 }
 
 type GpoConfig struct {
@@ -466,8 +469,7 @@ func DefaultConfig() *Config {
 				Prefix:  "",
 				Host:    "localhost",
 				API:     []string{"net", "web3"},
-				Cors:    []string{"localhost"},
-				VHost:   []string{"localhost"},
+				Origins: []string{"localhost"},
 			},
 			Graphql: &APIConfig{
 				Enabled: false,
@@ -921,7 +923,7 @@ func (c *Config) buildNode() (*node.Config, error) {
 		HTTPVirtualHosts:    c.JsonRPC.Http.VHost,
 		HTTPPathPrefix:      c.JsonRPC.Http.Prefix,
 		WSModules:           c.JsonRPC.Ws.API,
-		WSOrigins:           c.JsonRPC.Ws.Cors,
+		WSOrigins:           c.JsonRPC.Ws.Origins,
 		WSPathPrefix:        c.JsonRPC.Ws.Prefix,
 		GraphQLCors:         c.JsonRPC.Graphql.Cors,
 		GraphQLVirtualHosts: c.JsonRPC.Graphql.VHost,
diff --git a/internal/cli/server/flags.go b/internal/cli/server/flags.go
index ec74f89991..79aec3157a 100644
--- a/internal/cli/server/flags.go
+++ b/internal/cli/server/flags.go
@@ -350,17 +350,10 @@ func (c *Command) Flags() *flagset.Flagset {
 		Group:   "JsonRPC",
 	})
 	f.SliceStringFlag(&flagset.SliceStringFlag{
-		Name:    "ws.corsdomain",
-		Usage:   "Comma separated list of domains from which to accept cross origin requests (browser enforced)",
-		Value:   &c.cliConfig.JsonRPC.Ws.Cors,
-		Default: c.cliConfig.JsonRPC.Ws.Cors,
-		Group:   "JsonRPC",
-	})
-	f.SliceStringFlag(&flagset.SliceStringFlag{
-		Name:    "ws.vhosts",
-		Usage:   "Comma separated list of virtual hostnames from which to accept requests (server enforced). Accepts '*' wildcard.",
-		Value:   &c.cliConfig.JsonRPC.Ws.VHost,
-		Default: c.cliConfig.JsonRPC.Ws.VHost,
+		Name:    "ws.origins",
+		Usage:   "Origins from which to accept websockets requests",
+		Value:   &c.cliConfig.JsonRPC.Ws.Origins,
+		Default: c.cliConfig.JsonRPC.Ws.Origins,
 		Group:   "JsonRPC",
 	})
 	f.SliceStringFlag(&flagset.SliceStringFlag{
diff --git a/scripts/getconfig.go b/scripts/getconfig.go
index 136b69ecab..caf3f45a8e 100644
--- a/scripts/getconfig.go
+++ b/scripts/getconfig.go
@@ -95,7 +95,7 @@ var flagMap = map[string][]string{
 	"override.arrowglacier":            {"notABoolFlag", "No"},
 	"override.terminaltotaldifficulty": {"notABoolFlag", "No"},
 	"verbosity":                        {"notABoolFlag", "YesFV"},
-	"ws.origins":                       {"notABoolFlag", "YesF"},
+	"ws.origins":                       {"notABoolFlag", "No"},
 }
 
 // map from cli flags to corresponding toml tags
@@ -150,8 +150,7 @@ var nameTagMap = map[string]string{
 	"ipcpath":                "ipcpath",
 	"1-corsdomain":           "http.corsdomain",
 	"1-vhosts":               "http.vhosts",
-	"2-corsdomain":           "ws.corsdomain",
-	"2-vhosts":               "ws.vhosts",
+	"origins":                "ws.origins",
 	"3-corsdomain":           "graphql.corsdomain",
 	"3-vhosts":               "graphql.vhosts",
 	"1-enabled":              "http",
@@ -226,9 +225,8 @@ var replacedFlagsMapFlagAndValue = map[string]map[string]map[string]string{
 	},
 }
 
-var replacedFlagsMapFlag = map[string]string{
-	"ws.origins": "ws.corsdomain",
-}
+// Do not remove
+var replacedFlagsMapFlag = map[string]string{}
 
 var currentBoolFlags = []string{
 	"snapshot",