diff --git a/.gitignore b/.gitignore
index 9528746e4..ced10c230 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,12 @@ public/uploads/*
 !public/uploads/.gitkeep
 
 site/
+
+# Yarn 2+ without zero-installs
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/.yarn/releases/yarn-3.5.1.cjs b/.yarn/releases/yarn-3.5.1.cjs
new file mode 100755
index 000000000..97eed7580
Binary files /dev/null and b/.yarn/releases/yarn-3.5.1.cjs differ
diff --git a/.yarnrc.yml b/.yarnrc.yml
new file mode 100644
index 000000000..dff52e1f7
--- /dev/null
+++ b/.yarnrc.yml
@@ -0,0 +1,2 @@
+nodeLinker: node-modules
+yarnPath: .yarn/releases/yarn-3.5.1.cjs
diff --git a/package.json b/package.json
index 4a7362b1e..1dbaddef2 100644
--- a/package.json
+++ b/package.json
@@ -136,6 +136,7 @@
     "url": "https://github.com/hedgedoc/hedgedoc.git"
   },
   "devDependencies": {
+    "@hedgedoc/codemirror-5": "5.65.12",
     "abcjs": "6.2.2",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",
@@ -146,7 +147,6 @@
     "babel-runtime": "6.26.0",
     "bootstrap": "3.4.1",
     "bootstrap-validator": "0.11.9",
-    "@hedgedoc/codemirror-5": "5.65.12",
     "copy-webpack-plugin": "6.4.1",
     "css-loader": "5.2.7",
     "emojify.js": "1.1.0",
@@ -209,5 +209,6 @@
   "optionalDependencies": {
     "bufferutil": "^4.0.0",
     "utf-8-validate": "^6.0.0"
-  }
+  },
+  "packageManager": "yarn@3.5.1"
 }