diff --git a/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.test.ts b/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.test.ts
index 4fa906686c..a60d317077 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.test.ts
@@ -79,8 +79,8 @@ describe('handleAutocompleteRequest', () => {
 
     mockClient.Users.showCurrentUser.mockResolvedValue({ id: 3 });
     mockClient.Groups.allProjects.mockResolvedValue([
-      { name: 'repo1', id: 1 },
-      { name: 'repo2', id: 2 },
+      { name: 'Repo 1', path: 'repo-1', id: 1 },
+      { name: 'Repo 2', path: 'repo-2', id: 2 },
     ]);
 
     const result = await handleAutocompleteRequest({
@@ -91,8 +91,8 @@ describe('handleAutocompleteRequest', () => {
 
     expect(result).toEqual({
       results: [
-        { title: 'repo1', id: '1' },
-        { title: 'repo2', id: '2' },
+        { title: 'Repo 1', path: 'repo-1', id: '1' },
+        { title: 'Repo 2', path: 'repo-2', id: '2' },
       ],
     });
   });
diff --git a/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.ts b/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.ts
index 6e9a7f79c4..d9f2f4351d 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/autocomplete/autocomplete.ts
@@ -32,6 +32,7 @@ export function createHandleAutocompleteRequest(options: {
   }): Promise<{
     results: {
       title?: string;
+      path?: string;
       id: string;
     }[];
   }> {
@@ -97,6 +98,7 @@ export function createHandleAutocompleteRequest(options: {
         return {
           results: response.map(project => ({
             title: project.name.trim(),
+            path: project.path,
             id: project.id.toString(),
           })),
         };
diff --git a/plugins/scaffolder-react/src/api/types.ts b/plugins/scaffolder-react/src/api/types.ts
index 8e4d989a55..293a6a55e7 100644
--- a/plugins/scaffolder-react/src/api/types.ts
+++ b/plugins/scaffolder-react/src/api/types.ts
@@ -245,5 +245,5 @@ export interface ScaffolderApi {
     provider: string;
     resource: string;
     context?: Record<string, string>;
-  }): Promise<{ results: { title?: string; id: string }[] }>;
+  }): Promise<{ results: { title?: string; path?: string; id: string }[] }>;
 }
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
index d97c9431ee..abd7071f44 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
@@ -98,7 +98,7 @@ export const GitlabRepoPicker = (
       .then(({ results }) => {
         onChange({
           availableRepos: results.map(r => {
-            return { name: r.title!, id: r.id };
+            return { name: r.title!, path: r.path, id: r.id };
           }),
         });
       })
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
index 18da234012..41b00cc642 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
@@ -244,7 +244,7 @@ export const RepoUrlPicker = (
         onChange={repo =>
           setState(prevState => ({
             ...prevState,
-            repoName: repo.name,
+            repoName: repo.path || repo.name,
             id: repo.id || '',
           }))
         }
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts b/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts
index d37e764eae..e5c62aed08 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts
@@ -15,6 +15,7 @@
  */
 export interface AvailableRepositories {
   name: string;
+  path?: string;
   id?: string;
 }