diff --git a/internal/workspace/registry.go b/internal/workspace/registry.go
index 91b7a55..42a31e7 100644
--- a/internal/workspace/registry.go
+++ b/internal/workspace/registry.go
@@ -102,11 +102,12 @@ func (r *Registry) Register(hostPath string) mo.Result[*Workspace] {
 	}
 
 	hash := Hash(absPath)
+	dirName := filepath.Base(absPath)
 	ws := Workspace{
 		HostPath:  absPath,
 		Hash:      hash,
 		MountTag:  fmt.Sprintf("ws_%s", hash),
-		GuestPath: fmt.Sprintf("/workspace/%s", hash),
+		GuestPath: fmt.Sprintf("/workspace/%s-%s", hash, dirName),
 	}
 
 	r.workspaces[absPath] = ws