diff --git a/.goreleaser.yml b/.goreleaser.yml
index 088dcf38c7..2fe8ef9456 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -7,7 +7,7 @@ release:
 
 builds:
   - id: darwin-amd64
-    main: ./cmd/geth
+    main: ./cmd/cli
     binary: bor
     goos:
       - darwin
@@ -22,7 +22,7 @@ builds:
       -s -w
 
   - id: darwin-arm64
-    main: ./cmd/geth
+    main: ./cmd/cli
     binary: bor
     goos:
       - darwin
@@ -37,7 +37,7 @@ builds:
       -s -w
 
   - id: linux-amd64
-    main: ./cmd/geth
+    main: ./cmd/cli
     binary: bor
     goos:
       - linux
@@ -53,7 +53,7 @@ builds:
       -s -w -extldflags "-static"
 
   - id: linux-arm64
-    main: ./cmd/geth
+    main: ./cmd/cli
     binary: bor
     goos:
       - linux
diff --git a/Makefile b/Makefile
index 963c23ce33..a8b036acb4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,16 +14,8 @@ GORUN = env GO111MODULE=on go run
 GOPATH = $(shell go env GOPATH)
 
 bor:
-	$(GORUN) build/ci.go install ./cmd/geth
-	mkdir -p $(GOPATH)/bin/
-	cp $(GOBIN)/geth $(GOBIN)/bor
-	cp $(GOBIN)/* $(GOPATH)/bin/
-
-bor-all:
-	$(GORUN) build/ci.go install
 	mkdir -p $(GOPATH)/bin/
-	cp $(GOBIN)/geth $(GOBIN)/bor
-	cp $(GOBIN)/* $(GOPATH)/bin/
+	go build -o $(GOBIN)/bor ./cmd/cli/main.go
 
 protoc:
 	protoc --go_out=. --go-grpc_out=. ./internal/cli/server/proto/*.proto
@@ -164,7 +156,7 @@ geth-windows-amd64:
 	@ls -ld $(GOBIN)/geth-windows-* | grep amd64
 
 PACKAGE_NAME          := github.com/maticnetwork/bor
-GOLANG_CROSS_VERSION  ?= v1.17.2
+GOLANG_CROSS_VERSION  ?= v1.17.6
 
 .PHONY: release-dry-run
 release-dry-run:
diff --git a/README.md b/README.md
index b07c07a40f..c66b80dfb2 100644
--- a/README.md
+++ b/README.md
@@ -63,12 +63,6 @@ them using your favourite package manager. Once the dependencies are installed,
      $ make bor
      ```
 
-- or, to build the full suite of utilities:
-
-     ```shell
-     $ make bor-all
-     ```
-
 ### Make awesome changes!
 
 1. Create new branch for your changes
@@ -113,12 +107,6 @@ them using your favourite package manager. Once the dependencies are installed,
 <hr style="margin-top: 3em; margin-bottom: 3em;">
 
 
-Build the beta client:
-
-```shell
-go build -o bor-beta command/*.go
-```
-
 ## License
 
 The go-ethereum library (i.e. all code outside of the `cmd` directory) is licensed under the
diff --git a/builder/files/bor.service b/builder/files/bor.service
index fa84320a6c..4f834a3cb4 100644
--- a/builder/files/bor.service
+++ b/builder/files/bor.service
@@ -6,19 +6,19 @@
 [Service]
   Restart=on-failure
   RestartSec=5s
-  ExecStart=/usr/local/bin/bor \
-    --bor-mumbai \
-    # --bor-mainnet \
-    --datadir /var/lib/bor/data \
-    --bootnodes "enode://0cb82b395094ee4a2915e9714894627de9ed8498fb881cec6db7c65e8b9a5bd7f2f25cc84e71e89d0947e51c76e85d0847de848c7782b13c0255247a6758178c@44.232.55.71:30303,enode://88116f4295f5a31538ae409e4d44ad40d22e44ee9342869e7d68bdec55b0f83c1530355ce8b41fbec0928a7d75a5745d528450d30aec92066ab6ba1ee351d710@159.203.9.164:30303"
+  ExecStart=/usr/local/bin/bor server \
+    -chain=mumbai \
+    # -chain=mainnet \
+    -datadir /var/lib/bor/data \
+    -bootnodes "enode://0cb82b395094ee4a2915e9714894627de9ed8498fb881cec6db7c65e8b9a5bd7f2f25cc84e71e89d0947e51c76e85d0847de848c7782b13c0255247a6758178c@44.232.55.71:30303,enode://88116f4295f5a31538ae409e4d44ad40d22e44ee9342869e7d68bdec55b0f83c1530355ce8b41fbec0928a7d75a5745d528450d30aec92066ab6ba1ee351d710@159.203.9.164:30303"
     # Validator params
     # Uncomment and configure the following lines in case you run a validator
-    # --keystore /var/lib/bor/keystore \
-    # --unlock [VALIDATOR ADDRESS] \
-    # --password /var/lib/bor/password.txt \
-    # --allow-insecure-unlock \
-    # --nodiscover --maxpeers 1 \
-    # --mine
+    # -keystore /var/lib/bor/keystore \
+    # -unlock [VALIDATOR ADDRESS] \
+    # -password /var/lib/bor/password.txt \
+    # -allow-insecure-unlock \
+    # -nodiscover -maxpeers 1 \
+    # -mine
   Type=simple
   User=root
   KillSignal=SIGINT