diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54fb4ae136..798224cb54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@ All notable changes to `src-cli` are documented in this file.
 
 ### Fixed
 
+- Workspaces could sometimes fail with docker bind mount errors, due to a race condition of multiple workspaces accessing the same auxilliary files. [#468](https://github.com/sourcegraph/src-cli/pull/468)
+
 ### Removed
 
 ## 3.24.5
diff --git a/internal/campaigns/repo_fetcher.go b/internal/campaigns/repo_fetcher.go
index d5f439ce5d..7d19cac3d5 100644
--- a/internal/campaigns/repo_fetcher.go
+++ b/internal/campaigns/repo_fetcher.go
@@ -96,7 +96,7 @@ func (rf *repoFetcher) zipFor(repo *graphql.Repository, workspacePath string) *r
 			for _, component := range pathComponents {
 				for _, name := range []string{".gitignore", ".gitattributes"} {
 					filename := path.Join(currentPath, name)
-					localPath := filepath.Join(rf.dir, repo.SlugForPath(filename))
+					localPath := filepath.Join(rf.dir, repo.SlugForPath(workspacePath+filename))
 
 					zip.additionalFiles = append(zip.additionalFiles, &additionalFile{
 						filename:  filename,