diff --git a/server/config.yaml b/server/config.yaml
index cc65043..804ea2c 100644
--- a/server/config.yaml
+++ b/server/config.yaml
@@ -15,6 +15,7 @@
   repo_path: "/Users/shota/github/staff/"
   branch_prefix: "task/"
   commit_message_template: "Task {task_id}: {task_title} by {agent_name}"
+  workspace_path: "/Users/shota/staff/workspace"
   pr_template: |
     ## Task: {task_title}
     
diff --git a/server/config/config.go b/server/config/config.go
index c51bd43..baceb04 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -63,6 +63,7 @@
 // GitConfig represents Git operation configuration
 type GitConfig struct {
 	RepoPath              string `yaml:"repo_path"`
+	WorkspacePath         string `yaml:"workspace_path"`
 	CommitMessageTemplate string `yaml:"commit_message_template"`
 	PRTemplate            string `yaml:"pr_template"`
 }
diff --git a/server/git/git.go b/server/git/git.go
index 1160d0d..4cd7508 100644
--- a/server/git/git.go
+++ b/server/git/git.go
@@ -233,8 +233,7 @@
 		panic("no valid Git provider configured")
 	}
 
-	workspacePath := filepath.Join(".", "workspace") //TODO: make it configurable
-	cloneManager := NewCloneManager(repoURL, workspacePath)
+	cloneManager := NewCloneManager(repoURL, cfg.Git.WorkspacePath)
 
 	return &Git{
 		repoPath:     cfg.Git.RepoPath,