diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0d68cdb8695e..5eca6640e9111 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,12 @@
 # Change Log
+## v1.11.0 - 2021
+
+<a name="breaking_changes_1.11.0">[Breaking Changes:](#breaking_changes_1.11.0)</a>
+
+<a name="1.11.0_user-storage_scheme_updated"></a>
+
+-   [[user-storage]](#1.11.0_user-storage_scheme_updated) `UserStorageUri` scheme was changed from 'user_storage' to 'user-storage' as '\_' is not a valid char in scheme (according to [RFC 3986](https://tools.ietf.org/html/rfc3986#page-17)) [#9049](https://github.com/eclipse-theia/theia/pull/9049)
+
 
 ## v1.10.0 - 1/28/2021
 
diff --git a/packages/preferences/src/browser/preferences-json-schema-contribution.ts b/packages/preferences/src/browser/preferences-json-schema-contribution.ts
index 51b6300e45a31..646a9c9781b78 100644
--- a/packages/preferences/src/browser/preferences-json-schema-contribution.ts
+++ b/packages/preferences/src/browser/preferences-json-schema-contribution.ts
@@ -23,7 +23,7 @@ import { PreferenceConfigurations } from '@theia/core/lib/browser/preferences/pr
 import { PreferenceScope } from '@theia/core/lib/browser';
 
 const PREFERENCE_URI_PREFIX = 'vscode://schemas/settings/';
-const USER_STORAGE_PREFIX = 'user_storage:/';
+const USER_STORAGE_PREFIX = 'user-storage:/';
 
 @injectable()
 export class PreferencesJsonSchemaContribution implements JsonSchemaContribution {
diff --git a/packages/userstorage/src/browser/user-storage-uri.ts b/packages/userstorage/src/browser/user-storage-uri.ts
index a5bb5f374b659..ba627c0e57f70 100644
--- a/packages/userstorage/src/browser/user-storage-uri.ts
+++ b/packages/userstorage/src/browser/user-storage-uri.ts
@@ -16,4 +16,4 @@
 
 import URI from '@theia/core/lib/common/uri';
 
-export const UserStorageUri = new URI('user_storage:/user');
+export const UserStorageUri = new URI('user-storage:/user');
diff --git a/packages/workspace/src/browser/workspace-uri-contribution.spec.ts b/packages/workspace/src/browser/workspace-uri-contribution.spec.ts
index 5459bf5c0c4ce..1afcbb95aee9c 100644
--- a/packages/workspace/src/browser/workspace-uri-contribution.spec.ts
+++ b/packages/workspace/src/browser/workspace-uri-contribution.spec.ts
@@ -79,7 +79,7 @@ describe('WorkspaceUriLabelProviderContribution class', () => {
 
     describe('canHandle()', () => {
         it('should return 0 if the passed in argument is not a FileStat or URI with the "file" scheme', () => {
-            expect(labelProvider.canHandle(new URI('user_storage:settings.json'))).eq(0);
+            expect(labelProvider.canHandle(new URI('user-storage:settings.json'))).eq(0);
             expect(labelProvider.canHandle({ uri: 'file:///home/settings.json' })).eq(0);
         });