diff --git a/apps/gitness/src/components-v2/app-shell.tsx b/apps/gitness/src/components-v2/app-shell.tsx
index a97cd38be8..9743875537 100644
--- a/apps/gitness/src/components-v2/app-shell.tsx
+++ b/apps/gitness/src/components-v2/app-shell.tsx
@@ -2,7 +2,6 @@ import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { Outlet, useLocation, useNavigate, useParams } from 'react-router-dom'
 
 import {
-  AppSidebar,
   ManageNavigation,
   MenuGroupType,
   MenuGroupTypes,
@@ -23,6 +22,7 @@ import { useRepoImportEvents } from '../framework/hooks/useRepoImportEvent'
 import { useSelectedSpaceId } from '../framework/hooks/useSelectedSpaceId'
 import { useTranslationStore } from '../i18n/stores/i18n-store'
 import { PathParams } from '../RouteDefinitions'
+import { AppSidebar } from './app-sidebar'
 import Breadcrumbs from './breadcrumbs/breadcrumbs'
 import BreadcrumbsMFE from './breadcrumbs/breadcrumbs-mfe'
 import { Toaster } from './toaster'
@@ -191,7 +191,6 @@ export const AppShell = () => {
           pinnedMenuItems={pinnedMenu}
           handleChangePinnedMenuItem={handleChangePinnedMenuItem}
           handleRemoveRecentMenuItem={handleRemoveRecentMenuItem}
-          useTranslationStore={useTranslationStore}
         />
 
         <Sidebar.Inset>
diff --git a/packages/ui/src/components/app-sidebar/app-sidebar.tsx b/apps/gitness/src/components-v2/app-sidebar.tsx
similarity index 93%
rename from packages/ui/src/components/app-sidebar/app-sidebar.tsx
rename to apps/gitness/src/components-v2/app-sidebar.tsx
index 25d05cbd52..52019289fc 100644
--- a/packages/ui/src/components/app-sidebar/app-sidebar.tsx
+++ b/apps/gitness/src/components-v2/app-sidebar.tsx
@@ -1,26 +1,26 @@
 import { useState } from 'react'
 
+import { TypesUser } from '@harnessio/code-service-client'
 import {
   Icon,
   LanguageCode,
   LanguageDialog,
   LanguageInterface,
   languages,
+  NavbarItemType,
+  SearchProvider,
   Sidebar,
+  SidebarItem,
+  SidebarSearch,
+  SidebarSearchLegacy,
   ThemeDialog,
+  User,
   useSidebar
-} from '@/components'
-import { ContentStyleType, useRouterContext, useTheme } from '@/context'
-import { TypesUser } from '@/types'
-import { TranslationStore } from '@/views'
-import { cn } from '@utils/cn'
-
-import { SidebarItem } from './sidebar-item'
-import { SidebarSearchLegacy } from './sidebar-search-legacy'
-import { SearchProvider } from './sidebar-search/search-context'
-import { SidebarSearch } from './sidebar-search/sidebar-search'
-import { User } from './sidebar-user'
-import { NavbarItemType } from './types'
+} from '@harnessio/ui/components'
+import { ContentStyleType, useRouterContext, useTheme } from '@harnessio/ui/context'
+import { cn } from '@harnessio/ui/utils'
+
+import { useTranslationStore } from '../i18n/stores/i18n-store'
 
 const HarnessLogo = ({ className }: { className?: string }) => {
   const { Link } = useRouterContext()
@@ -51,13 +51,11 @@ interface SidebarProps {
   handleLogOut: () => void
   handleChangePinnedMenuItem: (item: NavbarItemType, pin: boolean) => void
   handleRemoveRecentMenuItem: (item: NavbarItemType) => void
-  useTranslationStore: () => TranslationStore
   showNewSearch?: boolean
   hasToggle?: boolean
 }
 
 export const AppSidebar = ({
-  useTranslationStore,
   handleChangePinnedMenuItem,
   handleRemoveRecentMenuItem,
   pinnedMenuItems,
diff --git a/packages/ui/locales/en/component.json b/packages/ui/locales/en/component.json
index cb7a544ecb..6a0af5c13e 100644
--- a/packages/ui/locales/en/component.json
+++ b/packages/ui/locales/en/component.json
@@ -1,13 +1,5 @@
 {
   "navbar": {
-    "more": "More",
-    "recent": "Recent",
-    "user-management": "User Management",
-    "settings": "Settings",
-    "sidebarToggle": {
-      "expand": "Expand",
-      "collapse": "Collapse"
-    },
     "pin": "Pin",
     "remove": "Remove",
     "reorder": "Reorder",
@@ -16,9 +8,17 @@
     "search": "Search",
     "command-palette": "Command Palette",
     "nothing-found": "Nothing found",
+    "settings": "Settings",
     "appearence": "Appearance",
     "language": "Language",
     "logout": "Log out",
+    "more": "More",
+    "recent": "Recent",
+    "user-management": "User Management",
+    "sidebarToggle": {
+      "expand": "Expand",
+      "collapse": "Collapse"
+    },
     "profile": "Profile",
     "theme": "Theme",
     "customNav": "Customize navigation",
diff --git a/packages/ui/locales/fr/component.json b/packages/ui/locales/fr/component.json
index cedc4caea9..a0dc1764f9 100644
--- a/packages/ui/locales/fr/component.json
+++ b/packages/ui/locales/fr/component.json
@@ -1,13 +1,5 @@
 {
   "navbar": {
-    "more": "Plus",
-    "recent": "Récent",
-    "user-management": "Gestion des utilisateurs",
-    "settings": "Paramètres",
-    "sidebarToggle": {
-      "expand": "Développer",
-      "collapse": "Réduire"
-    },
     "pin": "Épingler",
     "remove": "Supprimer",
     "reorder": "Réorganiser",
@@ -16,9 +8,17 @@
     "search": "Rechercher",
     "command-palette": "Palette de commandes",
     "nothing-found": "Rien trouvé",
+    "settings": "Paramètres",
     "appearence": "Appearance",
     "language": "Language",
     "logout": "Se déconnecter",
+    "more": "Plus",
+    "recent": "Récent",
+    "user-management": "Gestion des utilisateurs",
+    "sidebarToggle": {
+      "expand": "Développer",
+      "collapse": "Réduire"
+    },
     "profile": "Profile",
     "theme": "Thème",
     "customNav": "Personnaliser la navigation",
diff --git a/packages/ui/src/components/app-sidebar/index.ts b/packages/ui/src/components/app-sidebar/index.ts
index e12e5f979e..b78f802513 100644
--- a/packages/ui/src/components/app-sidebar/index.ts
+++ b/packages/ui/src/components/app-sidebar/index.ts
@@ -1,3 +1,7 @@
-export * from './app-sidebar'
 export * from './sidebar-search/command-palette'
+export * from './sidebar-search/sidebar-search'
+export * from './sidebar-search/search-context'
 export * from './types'
+export * from './sidebar-item'
+export * from './sidebar-user'
+export * from './sidebar-search-legacy'