diff --git a/garden-service/src/util/fs.ts b/garden-service/src/util/fs.ts
index b97cc78cad..4ce313ae3d 100644
--- a/garden-service/src/util/fs.ts
+++ b/garden-service/src/util/fs.ts
@@ -88,9 +88,12 @@ export async function getIgnorer(rootPath: string, gardenDirPath: string): Promi
     "node_modules",
     ".git",
     "*.log",
+    // This refers to the old static/**/.garden dir for system services. We still ignore it to prevent
+    // "module is declared multiple times" issues for users that already have it.
+    ".garden",
+    // This refers to the project level Garden cache dir. It defaults to .garden as well but we include it
+    // here as well since the value is not hard coded.
     gardenDirRelPath,
-    // TODO Take a better look at the temp files mutagen creates
-    ".mutagen-*",
     // debug info folders and zip files generated by garden
     "debug-info-*",
   ])