diff --git a/Makefile b/Makefile
index b486a9e061d..98d14c664f2 100644
--- a/Makefile
+++ b/Makefile
@@ -46,15 +46,15 @@ help: ## Display this help
 ##@ Build
 
 LD_FLAGS=-ldflags " \
-    -X cmd.kubeBuilderVersion=$(shell git describe --tags --dirty --broken) \
-    -X cmd.goos=$(shell go env GOOS) \
-    -X cmd.goarch=$(shell go env GOARCH) \
-    -X cmd.gitCommit=$(shell git rev-parse HEAD) \
-    -X cmd.buildDate=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \
+    -X main.kubeBuilderVersion=$(shell git describe --tags --dirty --broken) \
+    -X main.goos=$(shell go env GOOS) \
+    -X main.goarch=$(shell go env GOARCH) \
+    -X main.gitCommit=$(shell git rev-parse HEAD) \
+    -X main.buildDate=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \
     "
 .PHONY: build
 build: ## Build the project locally
-	go build $(LD_FLAGS) -o bin/kubebuilder
+	go build $(LD_FLAGS) -o bin/kubebuilder ./cmd
 
 .PHONY: install
 install: build ## Build and install the binary with the current source code. Use it to test your changes locally.
diff --git a/build/.goreleaser.yml b/build/.goreleaser.yml
index 1e895e52be1..8fb07482d00 100644
--- a/build/.goreleaser.yml
+++ b/build/.goreleaser.yml
@@ -29,15 +29,16 @@ before:
 # Build a binary for each target in targets.
 builds:
   - id: kubebuilder
+    main: ./cmd
     binary: kubebuilder
     mod_timestamp: "{{ .CommitTimestamp }}"
     ldflags:
-      - -X cmd.kubeBuilderVersion={{ .Version }}
-      - -X cmd.goos={{ .Os }}
-      - -X cmd.goarch={{ .Arch }}
-      - -X cmd.gitCommit={{ .Commit }}
-      - -X cmd.buildDate={{ .Date }}
-      - -X cmd.kubernetesVendorVersion={{ .Env.KUBERNETES_VERSION }}
+      - -X main.kubeBuilderVersion={{ .Version }}
+      - -X main.goos={{ .Os }}
+      - -X main.goarch={{ .Arch }}
+      - -X main.gitCommit={{ .Commit }}
+      - -X main.buildDate={{ .Date }}
+      - -X main.kubernetesVendorVersion={{ .Env.KUBERNETES_VERSION }}
     targets:
       - linux_amd64
       - linux_arm64
diff --git a/cmd/cmd.go b/cmd/main.go
similarity index 97%
rename from cmd/cmd.go
rename to cmd/main.go
index 2e6797c11a7..35e9db150aa 100644
--- a/cmd/cmd.go
+++ b/cmd/main.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package main
 
 import (
 	"github.com/sirupsen/logrus"
@@ -36,8 +36,7 @@ func init() {
 	logrus.SetFormatter(&logrus.TextFormatter{DisableTimestamp: true})
 }
 
-// Run bootstraps & runs the CLI
-func Run() {
+func main() {
 	// Bundle plugin which built the golang projects scaffold with base.go/v4 and kustomize/v2 plugins
 	gov4Bundle, _ := plugin.NewBundleWithOptions(plugin.WithName(golang.DefaultNameQualifier),
 		plugin.WithVersion(plugin.Version{Number: 4}),
diff --git a/cmd/version.go b/cmd/version.go
index 7eb39c0e470..7c37c5f2bcd 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -14,22 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package main
 
 import (
 	"fmt"
-	"runtime/debug"
 )
 
-const unknown = "unknown"
-
 // var needs to be used instead of const as ldflags is used to fill this
 // information in the release process
 var (
-	kubeBuilderVersion      = unknown
-	kubernetesVendorVersion = unknown
-	goos                    = unknown
-	goarch                  = unknown
+	kubeBuilderVersion      = "unknown"
+	kubernetesVendorVersion = "unknown"
+	goos                    = "unknown"
+	goarch                  = "unknown"
 	gitCommit               = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)
 
 	buildDate = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
@@ -47,12 +44,6 @@ type version struct {
 
 // versionString returns the CLI version
 func versionString() string {
-	if kubeBuilderVersion == unknown {
-		if info, ok := debug.ReadBuildInfo(); ok && info.Main.Version != "" {
-			kubeBuilderVersion = info.Main.Version
-		}
-	}
-
 	return fmt.Sprintf("Version: %#v", version{
 		kubeBuilderVersion,
 		kubernetesVendorVersion,
diff --git a/main.go b/main.go
deleted file mode 100644
index 9c09e8d825c..00000000000
--- a/main.go
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import "sigs.k8s.io/kubebuilder/v4/cmd"
-
-func main() {
-	cmd.Run()
-}
diff --git a/test/common.sh b/test/common.sh
index e85189ddd6e..5314898132c 100644
--- a/test/common.sh
+++ b/test/common.sh
@@ -109,7 +109,7 @@ SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""}
 function build_kb {
   header_text "Building kubebuilder"
 
-  go build -o "${kb_root_dir}/bin/kubebuilder"
+  go build -o "${kb_root_dir}/bin/kubebuilder" ./cmd
   kb="${kb_root_dir}/bin/kubebuilder"
 }