diff --git a/cmd/keyfetch/format.go b/cmd/keyfetch/format.go
index e5d90b01..3e2749f2 100644
--- a/cmd/keyfetch/format.go
+++ b/cmd/keyfetch/format.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 )
 
-func formatKeyData(repoguardPath string, data []map[string]interface{}) string {
+func formatKeyData(repoguardPath string, gitDir string, data []map[string]interface{}) string {
 	var result string
 	for _, entry := range data {
 		result += fmt.Sprintf(
-			`command="%s -base-dir /home/git -user %s -log-path /home/git/log ",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s`+"\n",
-			repoguardPath, entry["did"], entry["key"])
+			`command="%s -base-dir %s -user %s -log-path /home/git/log ",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s`+"\n",
+			repoguardPath, gitDir, entry["did"], entry["key"])
 	}
 	return result
 }
diff --git a/cmd/keyfetch/main.go b/cmd/keyfetch/main.go
index 9f8e349a..fecfd695 100644
--- a/cmd/keyfetch/main.go
+++ b/cmd/keyfetch/main.go
@@ -21,6 +21,7 @@ import (
 func main() {
 	endpoint := flag.String("internal-api", "http://localhost:5444", "Internal API endpoint")
 	repoguardPath := flag.String("repoguard-path", "/home/git/repoguard", "Path to the repoguard binary")
+	gitDir := flag.String("git-dir", "/home/git", "Path to the git directory")
 	flag.Parse()
 
 	resp, err := http.Get(*endpoint + "/keys")
@@ -40,5 +41,5 @@ func main() {
 		log.Fatalf("error unmarshalling response body: %v", err)
 	}
 
-	fmt.Print(formatKeyData(*repoguardPath, data))
+	fmt.Print(formatKeyData(*repoguardPath, *gitDir, data))
 }