diff --git a/app/cli/main.go b/app/cli/main.go
index c8907b9..2da1f1e 100644
--- a/app/cli/main.go
+++ b/app/cli/main.go
@@ -1,9 +1,22 @@
 package main
 
-import "awssh/internal/cli"
+import (
+	"awssh/config"
+	"awssh/internal/cli"
+	"os"
+)
 
 func main() {
-	cli.Execute()
+
+	config.Load()
+
+	rootCommand := cli.MakeRoot()
+
+	rootCommand.AddCommand(cli.MakeVersion())
+
+	if err := rootCommand.Execute(); err != nil {
+		os.Exit(1)
+	}
 }
 
 // TODO: unittest