diff --git a/cmd/starter/main.go b/cmd/starter/main.go
index e14cdc7..e721561 100644
--- a/cmd/starter/main.go
+++ b/cmd/starter/main.go
@@ -88,7 +88,7 @@ func main() {
 	workflowID := "orch-" + strings.ReplaceAll(*repoPath, "/", "-")
 	run, err := c.ExecuteWorkflow(context.Background(), client.StartWorkflowOptions{
 		ID:        workflowID,
-		TaskQueue: "default",
+		TaskQueue: "poimen-taskqueue",
 	}, statemachine.OrchestratorWorkflow, input)
 	if err != nil {
 		log.Fatalf("failed to start workflow: %v", err)
@@ -96,7 +96,7 @@ func main() {
 
 	fmt.Printf("\n=== Workflow Started ===\n")
 	fmt.Printf("Workflow ID: %s\n", workflowID)
-	fmt.Printf("Task Queue:  default\n")
+	fmt.Printf("Task Queue:  poimen-taskqueue\n")
 	fmt.Printf("\n=== Model Configuration ===\n")
 	fmt.Printf("Planner Model:     %s\n", *plannerModel)
 	fmt.Printf("Judge Model:       %s\n", *judgeModel)
diff --git a/cmd/worker/main.go b/cmd/worker/main.go
index 8d765ec..9bbf708 100644
--- a/cmd/worker/main.go
+++ b/cmd/worker/main.go
@@ -29,7 +29,7 @@ func main() {
 	defer c.Close()
 
 	// Create worker
-	w := worker.New(c, "default", worker.Options{})
+	w := worker.New(c, "poimen-taskqueue", worker.Options{})
 	if w == nil {
 		log.Fatalf("failed to create worker")
 	}
@@ -55,7 +55,7 @@ func main() {
 	// w.RegisterActivity(action.ReadLessonsActivity)
 
 	// Run worker
-	fmt.Println("Starting worker on queue 'default'...")
+	fmt.Println("Starting worker on queue 'poimen-taskqueue'...")
 	if err := w.Run(worker.InterruptCh()); err != nil {
 		log.Fatalf("worker failed: %v", err)
 	}