diff --git a/package.json b/package.json
index 82074272f..e91141016 100644
--- a/package.json
+++ b/package.json
@@ -8,9 +8,8 @@
   "license": "MIT",
   "scripts": {
     "audit": "lerna-audit",
-    "bootstrap": "lerna bootstrap --no-ci",
-    "bootstrapIgnoreScripts": "lerna bootstrap --ignore-scripts --no-ci",
-    "bootstrapServerOnly": "lerna bootstrap --no-ci --include-dependents --include-dependencies --scope @joplin/server",
+    "bootstrap": "lerna bootstrap --force-local --no-ci",
+    "bootstrapServerOnly": "lerna bootstrap --force-local --no-ci --include-dependents --include-dependencies --scope @joplin/server",
     "build": "lerna run build && npm run tsc",
     "buildApiDoc": "npm start --prefix=packages/app-cli -- apidoc ../../readme/api/references/rest_api.md",
     "buildDoc": "./packages/tools/build-all.sh",
diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json
index f319cafe9..221f9f769 100644
--- a/packages/app-cli/package.json
+++ b/packages/app-cli/package.json
@@ -31,7 +31,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.8.1",
+  "version": "2.0.0",
   "bin": {
     "joplin": "./main.js"
   },
diff --git a/packages/app-clipper/manifest.json b/packages/app-clipper/manifest.json
index 29dce864f..d7af5fd65 100644
--- a/packages/app-clipper/manifest.json
+++ b/packages/app-clipper/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "1.8.0",
+    "version": "2.0.0",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": "script-src 'self'; object-src 'self'",
diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json
index 382e6962b..4d97c34d0 100644
--- a/packages/app-desktop/package.json
+++ b/packages/app-desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "1.8.5",
+  "version": "2.0.0",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,
diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle
index 66136a4d4..85283ce31 100644
--- a/packages/app-mobile/android/app/build.gradle
+++ b/packages/app-mobile/android/app/build.gradle
@@ -142,7 +142,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 		versionCode 2097631
-		versionName "1.8.5"
+		versionName "2.0.0"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}
diff --git a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
index abeb70d0e..fb559c21f 100644
--- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
+++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
@@ -492,7 +492,7 @@
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 10.8.1;
+				MARKETING_VERSION = 20.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -519,7 +519,7 @@
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 10.8.1;
+				MARKETING_VERSION = 20.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -666,7 +666,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 10.8.1;
+				MARKETING_VERSION = 20.0.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@@ -697,7 +697,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 10.8.1;
+				MARKETING_VERSION = 20.0.0;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/packages/generator-joplin/generators/app/templates/src/manifest.json b/packages/generator-joplin/generators/app/templates/src/manifest.json
index 4b4257d00..686540150 100644
--- a/packages/generator-joplin/generators/app/templates/src/manifest.json
+++ b/packages/generator-joplin/generators/app/templates/src/manifest.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version": 1,
 	"id": "<%= pluginId %>",
-	"app_min_version": "1.8",
+	"app_min_version": "2.0",
 	"version": "1.0.0",
 	"name": "<%= pluginName %>",
 	"description": "<%= pluginDescription %>",
diff --git a/packages/generator-joplin/package.json b/packages/generator-joplin/package.json
index 6aab2f18d..8b464e371 100644
--- a/packages/generator-joplin/package.json
+++ b/packages/generator-joplin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-joplin",
-  "version": "1.8.1",
+  "version": "2.0.0",
   "description": "Scaffolds out a new Joplin plugin",
   "homepage": "https://github.com/laurent22/joplin/tree/dev/packages/generator-joplin",
   "author": {
@@ -34,4 +34,4 @@
   "repository": "https://github.com/laurent22/generator-joplin",
   "license": "MIT",
   "private": true
-}
\ No newline at end of file
+}
diff --git a/packages/lib/package.json b/packages/lib/package.json
index fda767c17..22f10b3da 100644
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/lib",
-  "version": "1.8.2",
+  "version": "2.0.0",
   "description": "Joplin Core library",
   "author": "Laurent Cozic",
   "homepage": "",
diff --git a/packages/plugin-repo-cli/package.json b/packages/plugin-repo-cli/package.json
index 5fd4838ce..d767200bd 100644
--- a/packages/plugin-repo-cli/package.json
+++ b/packages/plugin-repo-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/plugin-repo-cli",
-  "version": "1.8.2",
+  "version": "2.0.0",
   "description": "",
   "main": "index.js",
   "bin": {
diff --git a/packages/renderer/package.json b/packages/renderer/package.json
index ddc7f91d9..5524ad235 100644
--- a/packages/renderer/package.json
+++ b/packages/renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/renderer",
-  "version": "1.8.2",
+  "version": "2.0.0",
   "description": "The Joplin note renderer, used the mobile and desktop application",
   "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer",
   "main": "index.js",
diff --git a/packages/server/README.md b/packages/server/README.md
index de1ddae90..65be27c89 100644
--- a/packages/server/README.md
+++ b/packages/server/README.md
@@ -91,3 +91,13 @@ From `packages/server`, run `npm run start-dev`
 # Changelog
 
 [View the changelog](https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md)
+
+# License
+
+Copyright (c) 2017-2021 Laurent Cozic
+
+Personal Use License
+
+Joplin Server is available for personal use only. For example you may host the software on your own server for non-commercial activity.
+
+To obtain a license for commercial purposes, please contact us.
diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json
index d1ce1ecbf..83b8b6e62 100644
--- a/packages/server/package-lock.json
+++ b/packages/server/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "1.8.0",
+  "version": "2.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 2bcc7d0b0..0d3c610f7 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "1.8.0",
+  "version": "2.0.1",
   "private": true,
   "scripts": {
     "start-dev": "nodemon --config nodemon.json dist/app.js --env dev",
diff --git a/packages/tools/package.json b/packages/tools/package.json
index 1601c6df2..c25cd08d6 100644
--- a/packages/tools/package.json
+++ b/packages/tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/tools",
-  "version": "1.8.2",
+  "version": "2.0.0",
   "description": "Various tools for Joplin",
   "main": "index.js",
   "author": "Laurent Cozic",
diff --git a/packages/tools/release-cli.ts b/packages/tools/release-cli.ts
index c00d4ae91..b2809f663 100644
--- a/packages/tools/release-cli.ts
+++ b/packages/tools/release-cli.ts
@@ -21,7 +21,7 @@ async function main() {
 
 	await execCommand2('npm publish');
 
-	await completeReleaseWithChangelog(changelogPath, newVersion, newTag, 'CLI');
+	await completeReleaseWithChangelog(changelogPath, newVersion, newTag, 'CLI', false);
 }
 
 main().catch((error) => {
diff --git a/packages/tools/release-server.ts b/packages/tools/release-server.ts
index a3da90339..c9da192d4 100644
--- a/packages/tools/release-server.ts
+++ b/packages/tools/release-server.ts
@@ -3,23 +3,29 @@ import { execCommand2, rootDir, gitPullTry, completeReleaseWithChangelog } from
 const serverDir = `${rootDir}/packages/server`;
 
 async function main() {
+	const argv = require('yargs').argv;
+	if (!['release', 'prerelease'].includes(argv.type)) throw new Error('Must specify release type. Either --type=release or --type=prerelease');
+	const isPreRelease = argv.type === 'prerelease';
+
 	await gitPullTry();
 
 	process.chdir(serverDir);
 	const version = (await execCommand2('npm version patch')).trim();
 	const versionShort = version.substr(1);
+	const imageVersion = versionShort + (isPreRelease ? '-beta' : '');
 	const tagName = `server-${version}`;
 
 	process.chdir(rootDir);
 	console.info(`Running from: ${process.cwd()}`);
 
-	await execCommand2(`docker build -t "joplin/server:${versionShort}" -f Dockerfile.server .`);
-	await execCommand2(`docker tag "joplin/server:${versionShort}" "joplin/server:latest"`);
-	await execCommand2(`docker push joplin/server:${versionShort}`);
-	await execCommand2('docker push joplin/server:latest');
+	await execCommand2(`docker build -t "joplin/server:${imageVersion}" -f Dockerfile.server .`);
+	await execCommand2(`docker tag "joplin/server:${imageVersion}" "joplin/server:latest"`);
+	await execCommand2(`docker push joplin/server:${imageVersion}`);
+
+	if (!isPreRelease) await execCommand2('docker push joplin/server:latest');
 
 	const changelogPath = `${rootDir}/readme/changelog_server.md`;
-	await completeReleaseWithChangelog(changelogPath, version, tagName, 'Server');
+	await completeReleaseWithChangelog(changelogPath, version, tagName, 'Server', isPreRelease);
 }
 
 main().catch((error) => {
diff --git a/packages/tools/tool-utils.ts b/packages/tools/tool-utils.ts
index 13c0eaa1b..4fb54a805 100644
--- a/packages/tools/tool-utils.ts
+++ b/packages/tools/tool-utils.ts
@@ -22,7 +22,7 @@ function commandToString(commandName: string, args: string[] = []) {
 	return output.join(' ');
 }
 
-async function insertChangelog(tag: string, changelogPath: string, changelog: string) {
+async function insertChangelog(tag: string, changelogPath: string, changelog: string, isPrerelease: boolean) {
 	const currentText = await fs.readFile(changelogPath, 'UTF-8');
 	const lines = currentText.split('\n');
 
@@ -46,10 +46,11 @@ async function insertChangelog(tag: string, changelogPath: string, changelog: st
 	const header = [
 		'##',
 		`[${tag}](https://github.com/laurent22/joplin/releases/tag/${tag})`,
-		'-',
-		// eslint-disable-next-line no-useless-escape
-		`${moment.utc().format('YYYY-MM-DD\THH:mm:ss')}Z`,
 	];
+	if (isPrerelease) header.push('(Pre-release)');
+	header.push('-');
+	// eslint-disable-next-line no-useless-escape
+	header.push(`${moment.utc().format('YYYY-MM-DD\THH:mm:ss')}Z`);
 
 	let newLines = [];
 	newLines.push(header.join(' '));
@@ -62,10 +63,10 @@ async function insertChangelog(tag: string, changelogPath: string, changelog: st
 	return output.join('\n');
 }
 
-export async function completeReleaseWithChangelog(changelogPath: string, newVersion: string, newTag: string, appName: string) {
+export async function completeReleaseWithChangelog(changelogPath: string, newVersion: string, newTag: string, appName: string, isPreRelease: boolean) {
 	const changelog = (await execCommand2(`node ${rootDir}/packages/tools/git-changelog ${newTag}`, { })).trim();
 
-	const newChangelog = await insertChangelog(newTag, changelogPath, changelog);
+	const newChangelog = await insertChangelog(newTag, changelogPath, changelog, isPreRelease);
 
 	await fs.writeFile(changelogPath, newChangelog);
 
diff --git a/readme/changelog_server.md b/readme/changelog_server.md
index fe0284558..fc799cc6b 100644
--- a/readme/changelog_server.md
+++ b/readme/changelog_server.md
@@ -1,5 +1,15 @@
 # Joplin Server Changelog
 
+## [server-v2.0.1](https://github.com/laurent22/joplin/releases/tag/server-v2.0.1) (Pre-release) - 2021-05-14T13:55:45Z
+
+- New: Add support for sharing notes via a link (ccbc329)
+- New: Add support for sharing a folder (#4772)
+- New: Added log page to view latest changes to files (874f301)
+- Fixed: Prevent new user password from being hashed twice (76c143e)
+- Fixed: Fixed crash when rendering note with links to non-existing resources or notes (07484de)
+- Fixed: Fixed error handling when no session is provided (63a5bfa)
+- Fixed: Fixed uploading empty file to the API (#4402)
+
 ## [server-v1.7.2](https://github.com/laurent22/joplin/releases/tag/server-v1.7.2) - 2021-01-24T19:11:10Z
 
 - Fixed: Fixed password hashing when changing password