diff --git a/public/locales/en.json b/public/locales/en.json
index 986a9410..1db60e95 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -6,7 +6,7 @@
     "signInButton": "Sign in"
   },
   "Entities": {
-    "ManagedControlPlane": "Managed Control Plane",
+    "ManagedControlPlane": "ManagedControlPlane",
     "Project": "Project",
     "Workspace": "Workspace",
     "Users": "Users",
@@ -104,11 +104,8 @@
     "subtitleMessage": "Sorry, we couldn’t find what you are looking for.<br />The link may be incorrect or the {{entityType}} might have been removed.",
     "navigateHome": "Back to Homepage"
   },
-  "IntelligentBreadcrumbs": {
-    "homeLabel": "Home",
-    "projects": "Projects",
-    "workspaces": "Workspaces",
-    "mcps": "MCPs"
+  "PathAwareBreadcrumbs": {
+    "projectsLabel": "Projects"
   },
   "MCPContext": {
     "errorMessage": "An unknown error occurred"
diff --git a/src/Routes.ts b/src/Routes.ts
new file mode 100644
index 00000000..fd3ef0a1
--- /dev/null
+++ b/src/Routes.ts
@@ -0,0 +1,5 @@
+export const Routes = {
+  Home: '/',
+  Project: '/mcp/projects/:projectName',
+  Mcp: '/mcp/projects/:projectName/workspaces/:workspaceName/mcps/:controlPlaneName',
+} as const;
diff --git a/src/components/Core/BreadcrumbFeedbackHeader.tsx b/src/components/Core/BreadcrumbFeedbackHeader.tsx
new file mode 100644
index 00000000..4d4a4745
--- /dev/null
+++ b/src/components/Core/BreadcrumbFeedbackHeader.tsx
@@ -0,0 +1,63 @@
+import { Button, FlexBox, FlexBoxAlignItems, Menu, MenuItem } from '@ui5/webcomponents-react';
+
+import { useTranslation } from 'react-i18next';
+import { FeedbackButton } from './FeedbackButton.tsx';
+import { BetaButton } from './BetaButton.tsx';
+import { useRef, useState } from 'react';
+import { useAuthOnboarding } from '../../spaces/onboarding/auth/AuthContextOnboarding.tsx';
+import { SearchParamToggleVisibility } from '../Helper/FeatureToggleExistance.tsx';
+import { PathAwareBreadcrumbs } from './PathAwareBreadcrumbs/PathAwareBreadcrumbs.tsx';
+
+export function BreadcrumbFeedbackHeader() {
+  return (
+    <FlexBox alignItems={FlexBoxAlignItems.Center}>
+      <PathAwareBreadcrumbs />
+      <BetaButton />
+      <FeedbackButton />
+      <SearchParamToggleVisibility
+        shouldBeVisible={(params) => {
+          if (params === undefined) return false;
+          if (params.get('showHeaderBar') === null) return false;
+          return params?.get('showHeaderBar') === 'false';
+        }}
+      >
+        <LogoutMenu />
+      </SearchParamToggleVisibility>
+    </FlexBox>
+  );
+}
+
+function LogoutMenu() {
+  const auth = useAuthOnboarding();
+  const { t } = useTranslation();
+
+  const buttonRef = useRef(null);
+  const [menuIsOpen, setMenuIsOpen] = useState(false);
+  return (
+    <>
+      <Button
+        ref={buttonRef}
+        icon="menu2"
+        onClick={() => {
+          setMenuIsOpen(true);
+        }}
+      />
+      <Menu
+        opener={buttonRef.current}
+        open={menuIsOpen}
+        onClose={() => {
+          setMenuIsOpen(false);
+        }}
+      >
+        <MenuItem
+          icon="log"
+          text={t('ShellBar.signOutButton')}
+          onClick={async () => {
+            setMenuIsOpen(false);
+            await auth.logout();
+          }}
+        />
+      </Menu>
+    </>
+  );
+}
diff --git a/src/components/Core/IntelligentBreadcrumbs.tsx b/src/components/Core/IntelligentBreadcrumbs.tsx
deleted file mode 100644
index 8e641ce2..00000000
--- a/src/components/Core/IntelligentBreadcrumbs.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import {
-  Breadcrumbs,
-  BreadcrumbsDomRef,
-  Button,
-  FlexBox,
-  FlexBoxAlignItems,
-  Menu,
-  MenuItem,
-  Ui5CustomEvent,
-} from '@ui5/webcomponents-react';
-import { BreadcrumbsItem } from '@ui5/webcomponents-react/wrappers';
-import { NavigateOptions, useParams } from 'react-router-dom';
-import useLuigiNavigate from '../Shared/useLuigiNavigate.tsx';
-import LandscapeLabel from './LandscapeLabel.tsx';
-import { useTranslation } from 'react-i18next';
-import { FeedbackButton } from './FeedbackButton.tsx';
-import { BetaButton } from './BetaButton.tsx';
-import { useRef, useState } from 'react';
-import { useAuthOnboarding } from '../../spaces/onboarding/auth/AuthContextOnboarding.tsx';
-import { SearchParamToggleVisibility } from '../Helper/FeatureToggleExistance.tsx';
-
-const PREFIX = '/mcp';
-
-function navigateFromBreadcrumbs(navigate: (to: string, options?: NavigateOptions) => void) {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return (event: Ui5CustomEvent<BreadcrumbsDomRef, any>) => {
-    event.preventDefault();
-    // @ts-ignore
-    const href = event.detail.item.href;
-    navigate(href);
-  };
-}
-
-export default function IntelligentBreadcrumbs() {
-  const { projectName, workspaceName, controlPlaneName } = useParams();
-  const navigate = useLuigiNavigate();
-  const { t } = useTranslation();
-
-  return (
-    <>
-      <Breadcrumbs onItemClick={navigateFromBreadcrumbs(navigate)}>
-        <BreadcrumbsItem href={`${PREFIX}/projects`}>
-          <LandscapeLabel /> {t('IntelligentBreadcrumbs.homeLabel')}{' '}
-        </BreadcrumbsItem>
-        {projectName && (
-          <>
-            <BreadcrumbsItem href={`${PREFIX}/projects`}>{t('IntelligentBreadcrumbs.projects')}</BreadcrumbsItem>
-            <BreadcrumbsItem href={`${PREFIX}/projects/${projectName}`}>{projectName}</BreadcrumbsItem>
-            {workspaceName && (
-              <>
-                <BreadcrumbsItem href={`${PREFIX}/projects/${projectName}`}>
-                  {t('IntelligentBreadcrumbs.workspaces')}
-                </BreadcrumbsItem>
-                <BreadcrumbsItem href={`${PREFIX}/projects/${projectName}`}>{workspaceName}</BreadcrumbsItem>
-                {controlPlaneName && (
-                  <>
-                    <BreadcrumbsItem href={`${PREFIX}/projects/${projectName}`}>
-                      {t('IntelligentBreadcrumbs.mcps')}
-                    </BreadcrumbsItem>
-                    <BreadcrumbsItem
-                      href={`${PREFIX}/projects/${projectName}/workspaces/${workspaceName}/mcps/${controlPlaneName}`}
-                    >
-                      {controlPlaneName}
-                    </BreadcrumbsItem>
-                  </>
-                )}
-              </>
-            )}
-          </>
-        )}
-      </Breadcrumbs>
-    </>
-  );
-}
-
-export function BreadCrumbFeedbackHeader() {
-  return (
-    <FlexBox alignItems={FlexBoxAlignItems.Center}>
-      <IntelligentBreadcrumbs />
-      <BetaButton />
-      <FeedbackButton />
-      <SearchParamToggleVisibility
-        shouldBeVisible={(params) => {
-          if (params === undefined) return false;
-          if (params.get('showHeaderBar') === null) return false;
-          return params?.get('showHeaderBar') === 'false';
-        }}
-      >
-        <LogoutMenu />
-      </SearchParamToggleVisibility>
-    </FlexBox>
-  );
-}
-
-function LogoutMenu() {
-  const auth = useAuthOnboarding();
-  const { t } = useTranslation();
-
-  const buttonRef = useRef(null);
-  const [menuIsOpen, setMenuIsOpen] = useState(false);
-  return (
-    <>
-      <Button
-        ref={buttonRef}
-        icon="menu2"
-        onClick={() => {
-          setMenuIsOpen(true);
-        }}
-      />
-      <Menu
-        opener={buttonRef.current}
-        open={menuIsOpen}
-        onClose={() => {
-          setMenuIsOpen(false);
-        }}
-      >
-        <MenuItem
-          icon="log"
-          text={t('ShellBar.signOutButton')}
-          onClick={async () => {
-            setMenuIsOpen(false);
-            await auth.logout();
-          }}
-        />
-      </Menu>
-    </>
-  );
-}
diff --git a/src/components/Core/LandscapeLabel.tsx b/src/components/Core/LandscapeLabel.tsx
deleted file mode 100644
index 119b47ce..00000000
--- a/src/components/Core/LandscapeLabel.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { useFrontendConfig } from '../../context/FrontendConfigContext.tsx';
-
-export default function LandscapeLabel() {
-  const frontendConfig = useFrontendConfig();
-  return <>{`[${frontendConfig.landscape}]`}</>;
-}
diff --git a/src/components/Core/PathAwareBreadcrumbs/PathAwareBreadcrumbs.cy.tsx b/src/components/Core/PathAwareBreadcrumbs/PathAwareBreadcrumbs.cy.tsx
new file mode 100644
index 00000000..73b800bf
--- /dev/null
+++ b/src/components/Core/PathAwareBreadcrumbs/PathAwareBreadcrumbs.cy.tsx
@@ -0,0 +1,75 @@
+import { PathAwareBreadcrumbs } from './PathAwareBreadcrumbs';
+import { useNavigate, useParams } from 'react-router-dom';
+
+describe('PathAwareBreadcrumbs', () => {
+  let lastNavigatedPath = '';
+  const fakeUseNavigate = (() => (path: string) => {
+    lastNavigatedPath = path;
+  }) as typeof useNavigate;
+  const fakeUseParams = (() => ({
+    projectName: 'my-project',
+    workspaceName: 'my-workspace',
+    controlPlaneName: 'my-control-plane',
+  })) as typeof useParams;
+
+  beforeEach(() => {
+    lastNavigatedPath = '';
+  });
+
+  it('renders breadcrumbs for all path parameters', () => {
+    cy.mount(<PathAwareBreadcrumbs useNavigate={fakeUseNavigate} useParams={fakeUseParams} />);
+
+    // Check that all breadcrumbs are rendered
+    cy.get("[data-testid='breadcrumb-item']").should('have.length', 3);
+    cy.get("[data-testid='breadcrumb-item']").eq(0).should('contain', '[LOCAL] Projects');
+    cy.get("[data-testid='breadcrumb-item']").eq(1).should('contain', 'my-project');
+    cy.get("[data-testid='breadcrumb-item']").eq(2).should('contain', 'my-workspace');
+  });
+
+  it('navigates when clicking breadcrumbs for all path parameters', () => {
+    cy.mount(<PathAwareBreadcrumbs useNavigate={fakeUseNavigate} useParams={fakeUseParams} />);
+
+    // Navigate to '/'
+    cy.contains('[LOCAL] Projects').click();
+    cy.wrap(null).then(() => {
+      expect(lastNavigatedPath).to.equal('/');
+    });
+
+    // Click on 'my-project' > Navigate to 'my-project'
+    cy.contains('my-project').click();
+    cy.wrap(null).then(() => {
+      expect(lastNavigatedPath).to.equal('/mcp/projects/my-project');
+    });
+
+    // Click on 'my-workspace' > Navigate to 'my-project' since workspaces don’t expose a direct path
+    cy.contains('my-workspace').click();
+    cy.wrap(null).then(() => {
+      expect(lastNavigatedPath).to.equal('/mcp/projects/my-project');
+    });
+  });
+
+  it('renders only home breadcrumb when there are no path parameters', () => {
+    const fakeUseParams = (() => ({})) as typeof useParams;
+
+    cy.mount(<PathAwareBreadcrumbs useNavigate={fakeUseNavigate} useParams={fakeUseParams} />);
+
+    cy.get("[data-testid='breadcrumb-item']").should('have.length', 1);
+  });
+
+  it('handles partial route parameters', () => {
+    const fakeUseParams = (() => ({
+      projectName: 'my-project',
+      // No workspaceName
+      // No controlPlaneName
+    })) as typeof useParams;
+
+    cy.mount(<PathAwareBreadcrumbs useNavigate={fakeUseNavigate} useParams={fakeUseParams} />);
+
+    // Should show 3 breadcrumbs
+    cy.get("[data-testid='breadcrumb-item']").should('have.length', 2);
+
+    // Verify data-target attributes
+    cy.get("[data-testid='breadcrumb-item']").eq(0).should('contain', '[LOCAL] Projects');
+    cy.get("[data-testid='breadcrumb-item']").eq(1).should('contain', 'my-project');
+  });
+});
diff --git a/src/components/Core/PathAwareBreadcrumbs/PathAwareBreadcrumbs.tsx b/src/components/Core/PathAwareBreadcrumbs/PathAwareBreadcrumbs.tsx
new file mode 100644
index 00000000..96fd2c98
--- /dev/null
+++ b/src/components/Core/PathAwareBreadcrumbs/PathAwareBreadcrumbs.tsx
@@ -0,0 +1,67 @@
+import { Breadcrumbs } from '@ui5/webcomponents-react';
+import { BreadcrumbsItem } from '@ui5/webcomponents-react/wrappers';
+import { generatePath, useNavigate as _useNavigate, useParams as _useParams } from 'react-router-dom';
+
+import { useTranslation } from 'react-i18next';
+import { useFrontendConfig } from '../../../context/FrontendConfigContext.tsx';
+import { Routes } from '../../../Routes.ts';
+
+export interface PathAwareBreadcrumbsProps {
+  useNavigate?: typeof _useNavigate;
+  useParams?: typeof _useParams;
+}
+export function PathAwareBreadcrumbs({
+  useNavigate = _useNavigate,
+  useParams = _useParams,
+}: PathAwareBreadcrumbsProps) {
+  const { projectName, workspaceName } = useParams();
+  const { t } = useTranslation();
+  const frontendConfig = useFrontendConfig();
+  const navigate = useNavigate();
+
+  const breadcrumbItems: { label: string; path: string }[] = [
+    {
+      label: `[${frontendConfig.landscape}] ${t('PathAwareBreadcrumbs.projectsLabel')}`,
+      path: Routes.Home,
+    },
+  ];
+
+  if (projectName) {
+    breadcrumbItems.push({
+      label: projectName,
+      path: generatePath(Routes.Project, {
+        projectName,
+      }),
+    });
+
+    if (workspaceName) {
+      breadcrumbItems.push({
+        label: workspaceName,
+        // Navigate to the project route since workspaces don't provide a direct path
+        path: generatePath(Routes.Project, {
+          projectName,
+        }),
+      });
+    }
+  }
+
+  return (
+    <Breadcrumbs
+      design="NoCurrentPage"
+      onItemClick={(event) => {
+        event.preventDefault();
+        const target = event.detail.item.dataset.target;
+
+        if (target) {
+          navigate(target);
+        }
+      }}
+    >
+      {breadcrumbItems.map((item) => (
+        <BreadcrumbsItem key={item.path} data-target={item.path} data-testid="breadcrumb-item">
+          {item.label}
+        </BreadcrumbsItem>
+      ))}
+    </Breadcrumbs>
+  );
+}
diff --git a/src/spaces/mcp/pages/McpPage.tsx b/src/spaces/mcp/pages/McpPage.tsx
index 58669c28..0fbaa19d 100644
--- a/src/spaces/mcp/pages/McpPage.tsx
+++ b/src/spaces/mcp/pages/McpPage.tsx
@@ -7,7 +7,7 @@ import '@ui5/webcomponents-fiori/dist/illustrations/SimpleError';
 // thorws error sometimes if not imported
 import '@ui5/webcomponents-fiori/dist/illustrations/BeforeSearch';
 import IllustratedError from '../../../components/Shared/IllustratedError.tsx';
-import { BreadCrumbFeedbackHeader } from '../../../components/Core/IntelligentBreadcrumbs.tsx';
+import { BreadcrumbFeedbackHeader } from '../../../components/Core/BreadcrumbFeedbackHeader.tsx';
 
 import FluxList from '../../../components/ControlPlane/FluxList.tsx';
 import { ControlPlane as ControlPlaneResource } from '../../../lib/api/types/crate/controlPlanes.ts';
@@ -70,7 +70,8 @@ export default function McpPage() {
             titleArea={
               <ObjectPageTitle
                 header={displayName ?? controlPlaneName}
-                breadcrumbs={<BreadCrumbFeedbackHeader />}
+                subHeader={t('Entities.ManagedControlPlane')}
+                breadcrumbs={<BreadcrumbFeedbackHeader />}
                 //TODO: actionBar should use Toolbar and ToolbarButton for consistent design
                 actionsBar={
                   <div
diff --git a/src/spaces/onboarding/pages/ProjectPage.tsx b/src/spaces/onboarding/pages/ProjectPage.tsx
index ab1808e3..cd493e1f 100644
--- a/src/spaces/onboarding/pages/ProjectPage.tsx
+++ b/src/spaces/onboarding/pages/ProjectPage.tsx
@@ -2,7 +2,7 @@ import { ObjectPage, ObjectPageTitle, Title } from '@ui5/webcomponents-react';
 import ProjectChooser from '../../../components/Projects/ProjectChooser.tsx';
 import { useParams } from 'react-router-dom';
 import ControlPlaneListAllWorkspaces from '../../../components/ControlPlanes/List/ControlPlaneListAllWorkspaces.tsx';
-import { BreadCrumbFeedbackHeader } from '../../../components/Core/IntelligentBreadcrumbs.tsx';
+import { BreadcrumbFeedbackHeader } from '../../../components/Core/BreadcrumbFeedbackHeader.tsx';
 import { ControlPlaneListToolbar } from '../../../components/ControlPlanes/List/ControlPlaneListToolbar.tsx';
 import { Trans, useTranslation } from 'react-i18next';
 import { useApiResource } from '../../../lib/api/useApiResource.ts';
@@ -52,7 +52,7 @@ export default function ProjectPage() {
                 <ProjectChooser currentProjectName={projectName ?? ''} />
               </div>
             }
-            breadcrumbs={<BreadCrumbFeedbackHeader />}
+            breadcrumbs={<BreadcrumbFeedbackHeader />}
             actionsBar={<ControlPlaneListToolbar projectName={projectName ?? ''} />}
           />
         }
diff --git a/src/views/ProjectList.tsx b/src/views/ProjectList.tsx
index ebb9fdd0..6fabb12c 100644
--- a/src/views/ProjectList.tsx
+++ b/src/views/ProjectList.tsx
@@ -1,6 +1,6 @@
 import { ObjectPage, ObjectPageTitle } from '@ui5/webcomponents-react';
 import ProjectsList from '../components/Projects/ProjectsList.tsx';
-import { BreadCrumbFeedbackHeader } from '../components/Core/IntelligentBreadcrumbs.tsx';
+import { BreadcrumbFeedbackHeader } from '../components/Core/BreadcrumbFeedbackHeader.tsx';
 import { ProjectListToolbar } from '../components/Projects/ProjectListToolbar.tsx';
 import { useTranslation } from 'react-i18next';
 
@@ -13,7 +13,7 @@ export default function ProjectsListView() {
       titleArea={
         <ObjectPageTitle
           header={t('ProjectsListView.pageTitle')}
-          breadcrumbs={<BreadCrumbFeedbackHeader />}
+          breadcrumbs={<BreadcrumbFeedbackHeader />}
           actionsBar={<ProjectListToolbar />}
         />
       }