diff --git a/libraries/eslint-plugin/package.json b/libraries/eslint-plugin/package.json
index 4d1ac91ff9..bd92f43f3c 100644
--- a/libraries/eslint-plugin/package.json
+++ b/libraries/eslint-plugin/package.json
@@ -5,12 +5,14 @@
   "license": "AGPL-3.0-only",
   "main": "index.js",
   "dependencies": {
-    "eslint": "^8.51.0",
     "lodash": "^4.18.1"
   },
   "devDependencies": {
     "@typescript-eslint/parser": "^8.50.0"
   },
+  "peerDependencies": {
+    "eslint": "^8.51.0"
+  },
   "scripts": {
     "test": "node rules.test.js"
   }
diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile
index 8c7d02606b..b76f50c15f 100644
--- a/server-ce/Dockerfile
+++ b/server-ce/Dockerfile
@@ -25,6 +25,7 @@ ENV COREPACK_ENABLE_NETWORK=0
 # -------------------------
 RUN --mount=type=cache,target=/root/.cache \
     --mount=type=cache,target=/root/.yarn/berry/cache,id=server-ce-yarn-cache \
+    --mount=type=cache,target=/usr/local/share/.cache/yarn,id=server-ce-yarn-fallback-cache \
     --mount=type=tmpfs,target=/tmp node genScript install | bash
 
 # Add the actual source files
@@ -32,9 +33,10 @@ RUN --mount=type=cache,target=/root/.cache \
 COPY --parents libraries/ services/ tools/migrations/ /overleaf/
 RUN --mount=type=cache,target=/root/.cache \
     --mount=type=cache,target=/root/.yarn/berry/cache,id=server-ce-yarn-cache \
+    --mount=type=cache,target=/usr/local/share/.cache/yarn,id=server-ce-yarn-fallback-cache \
     --mount=type=cache,target=/overleaf/services/web/node_modules/.cache,id=server-ce-webpack-cache \
     --mount=type=tmpfs,target=/tmp \
-    YARN_CACHE_FOLDER=/tmp/.yarn-cache node genScript compile | bash
+    node genScript compile | bash
 
 # Copy runit service startup scripts to its location
 # --------------------------------------------------
diff --git a/yarn.lock b/yarn.lock
index f49023a09b..defb6c6a08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6565,8 +6565,9 @@ __metadata:
   resolution: "@overleaf/eslint-plugin@workspace:libraries/eslint-plugin"
   dependencies:
     "@typescript-eslint/parser": "npm:^8.50.0"
-    eslint: "npm:^8.51.0"
     lodash: "npm:^4.18.1"
+  peerDependencies:
+    eslint: ^8.51.0
   languageName: unknown
   linkType: soft
 
@@ -17965,7 +17966,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^8.15.0, eslint@npm:^8.51.0, eslint@npm:^8.57.0":
+"eslint@npm:^8.15.0, eslint@npm:^8.57.0":
   version: 8.57.1
   resolution: "eslint@npm:8.57.1"
   dependencies: