diff --git a/che-editors.yaml b/che-editors.yaml
index 57e65c9a0..a5ced869f 100644
--- a/che-editors.yaml
+++ b/che-editors.yaml
@@ -5,7 +5,7 @@ editors:
     displayName: theia-ide
     description: Eclipse Theia, get the latest release each day.
     icon: https://raw.githubusercontent.com/theia-ide/theia/master/logo/theia-logo-no-text-black.svg?sanitize=true
-    repository: https://github.com/eclipse/che-theia
+    repository: https://github.com/eclipse-che/che-theia
     firstPublicationDate: "2019-03-07"
     endpoints:
       - name: "theia"
@@ -123,7 +123,7 @@ editors:
     displayName: theia-ide
     description: Eclipse Theia
     icon: https://raw.githubusercontent.com/theia-ide/theia/master/logo/theia-logo-no-text-black.svg?sanitize=true
-    repository: https://github.com/eclipse/che-theia
+    repository: https://github.com/eclipse-che/che-theia
     firstPublicationDate: "2019-03-07"
     endpoints:
       - name: "theia"
diff --git a/tools/build/tests/_data/meta/che-theia-meta.yaml b/tools/build/tests/_data/meta/che-theia-meta.yaml
index 7c17c8d44..41f90b1ba 100644
--- a/tools/build/tests/_data/meta/che-theia-meta.yaml
+++ b/tools/build/tests/_data/meta/che-theia-meta.yaml
@@ -8,7 +8,7 @@ title: Eclipse Theia development version.
 description: 'Eclipse Theia, get the latest release each day.'
 icon: /v3/images/eclipse-che-logo.png
 category: Editor
-repository: 'https://github.com/eclipse/che-theia'
+repository: 'https://github.com/eclipse-che/che-theia'
 firstPublicationDate: '2019-03-07'
 latestUpdateDate: '2021-02-19'
 spec:
diff --git a/tools/build/tests/_data/meta/no-container.yaml b/tools/build/tests/_data/meta/no-container.yaml
index 7d10be360..71b633d0a 100644
--- a/tools/build/tests/_data/meta/no-container.yaml
+++ b/tools/build/tests/_data/meta/no-container.yaml
@@ -8,7 +8,7 @@ title: Eclipse Theia development version.
 description: 'Eclipse Theia, get the latest release each day.'
 icon: /v3/images/eclipse-che-logo.png
 category: Editor
-repository: 'https://github.com/eclipse/che-theia'
+repository: 'https://github.com/eclipse-che/che-theia'
 firstPublicationDate: '2019-03-07'
 latestUpdateDate: '2021-02-19'
 spec:
diff --git a/tools/build/tests/editor/che-editor-analyzer.spec.ts b/tools/build/tests/editor/che-editor-analyzer.spec.ts
index fee8b7181..54f2396c6 100644
--- a/tools/build/tests/editor/che-editor-analyzer.spec.ts
+++ b/tools/build/tests/editor/che-editor-analyzer.spec.ts
@@ -40,6 +40,6 @@ describe('Test CheEditorsAnalyzer', () => {
     expect(theiaEditors).toBeDefined();
     expect(theiaEditors.length).toBe(1);
     const theiaEditor = theiaEditors[0];
-    expect(theiaEditor.repository).toBe('https://github.com/eclipse/che-theia');
+    expect(theiaEditor.repository).toBe('https://github.com/eclipse-che/che-theia');
   });
 });
diff --git a/tools/build/tests/editor/che-editor-meta-yaml-generator.spec.ts b/tools/build/tests/editor/che-editor-meta-yaml-generator.spec.ts
index b9a710c49..68a30891f 100644
--- a/tools/build/tests/editor/che-editor-meta-yaml-generator.spec.ts
+++ b/tools/build/tests/editor/che-editor-meta-yaml-generator.spec.ts
@@ -29,7 +29,7 @@ describe('Test ChePluginsMetaYamlGenerator', () => {
       displayName: 'theia-ide',
       description: 'Eclipse Theia, get the latest release each day.',
       icon: 'https://raw.githubusercontent.com/theia-ide/theia/master/logo/theia-logo-no-text-black.svg?sanitize=true',
-      repository: 'https://github.com/eclipse/che-theia',
+      repository: 'https://github.com/eclipse-che/che-theia',
       firstPublicationDate: '2019-03-07',
       endpoints: [
         {