diff --git a/src/components/Components/ComponentDetails/tabs/ComponentLatestBuild.tsx b/src/components/Components/ComponentDetails/tabs/ComponentLatestBuild.tsx
index 6495f34b..43a223dc 100644
--- a/src/components/Components/ComponentDetails/tabs/ComponentLatestBuild.tsx
+++ b/src/components/Components/ComponentDetails/tabs/ComponentLatestBuild.tsx
@@ -15,6 +15,7 @@ import {
 import { useLatestSuccessfulBuildPipelineRunForComponent } from '../../../../hooks/usePipelineRuns';
 import { useTaskRuns } from '../../../../hooks/useTaskRuns';
 import { HttpError } from '../../../../k8s/error';
+import { COMMIT_DETAILS_PATH } from '../../../../routes/paths';
 import ErrorEmptyState from '../../../../shared/components/empty-state/ErrorEmptyState';
 import { Timestamp } from '../../../../shared/components/timestamp/Timestamp';
 import { ComponentKind } from '../../../../types';
@@ -22,8 +23,8 @@ import { getCommitsFromPLRs } from '../../../../utils/commits-utils';
 import { getLastestImage } from '../../../../utils/component-utils';
 import CommitLabel from '../../../Commits/commit-label/CommitLabel';
 import { useBuildLogViewerModal } from '../../../LogViewer/BuildLogViewer';
+import { useNamespace } from '../../../Namespace/useNamespaceInfo';
 import ScanDescriptionListGroup from '../../../PipelineRun/PipelineRunDetailsView/tabs/ScanDescriptionListGroup';
-import { useWorkspaceInfo } from '../../../Workspace/useWorkspaceInfo';
 
 type ComponentLatestBuildProps = {
   component: ComponentKind;
@@ -32,7 +33,7 @@ type ComponentLatestBuildProps = {
 const ComponentLatestBuild: React.FC<React.PropsWithChildren<ComponentLatestBuildProps>> = ({
   component,
 }) => {
-  const { namespace, workspace } = useWorkspaceInfo();
+  const namespace = useNamespace();
   const [pipelineRun, pipelineRunLoaded, error] = useLatestSuccessfulBuildPipelineRunForComponent(
     namespace,
     component.metadata.name,
@@ -101,7 +102,11 @@ const ComponentLatestBuild: React.FC<React.PropsWithChildren<ComponentLatestBuil
               {commit ? (
                 <>
                   <Link
-                    to={`/workspaces/${workspace}/applications/${commit.application}/commit/${commit.sha}`}
+                    to={COMMIT_DETAILS_PATH.createPath({
+                      workspaceName: namespace,
+                      applicationName: commit.application,
+                      commitSha: commit.sha,
+                    })}
                   >
                     {commit.isPullRequest ? `#${commit.pullRequestNumber}` : ''} {commit.shaTitle}
                   </Link>