diff --git a/plugins/openchoreo-react/src/components/PipelineFlowVisualization/PipelineFlowVisualization.tsx b/plugins/openchoreo-react/src/components/PipelineFlowVisualization/PipelineFlowVisualization.tsx
index 482c5443..02c2bcd9 100644
--- a/plugins/openchoreo-react/src/components/PipelineFlowVisualization/PipelineFlowVisualization.tsx
+++ b/plugins/openchoreo-react/src/components/PipelineFlowVisualization/PipelineFlowVisualization.tsx
@@ -49,16 +49,19 @@ const capitalizeFirst = (str: string) => {
   return str.charAt(0).toUpperCase() + str.slice(1);
 };
 
-const entityRefToUrl = (entityRef: string): string => {
+const entityRefToUrl = (
+  entityRef: string,
+  fallbackNamespace = 'default',
+): string => {
   const colonIndex = entityRef.indexOf(':');
-  if (colonIndex === -1) return `/catalog/default/${entityRef}`;
+  if (colonIndex === -1) return `/catalog/${fallbackNamespace}/${entityRef}`;
 
   const kind = entityRef.substring(0, colonIndex);
   const rest = entityRef.substring(colonIndex + 1);
   const slashIndex = rest.indexOf('/');
 
   if (slashIndex === -1) {
-    return `/catalog/default/${kind}/${rest}`;
+    return `/catalog/${fallbackNamespace}/${kind}/${rest}`;
   }
 
   const namespace = rest.substring(0, slashIndex);
@@ -119,7 +122,7 @@ export const PipelineFlowVisualization = ({
 
       {showPipelineLink && pipelineEntityRef && (
         <Link
-          to={entityRefToUrl(pipelineEntityRef)}
+          to={entityRefToUrl(pipelineEntityRef, environmentNamespace)}
           style={{ textDecoration: 'none' }}
         >
           <Button
diff --git a/plugins/openchoreo/src/components/EnvironmentOverview/EnvironmentPromotionCard.tsx b/plugins/openchoreo/src/components/EnvironmentOverview/EnvironmentPromotionCard.tsx
index fefddc61..dab5403b 100644
--- a/plugins/openchoreo/src/components/EnvironmentOverview/EnvironmentPromotionCard.tsx
+++ b/plugins/openchoreo/src/components/EnvironmentOverview/EnvironmentPromotionCard.tsx
@@ -151,9 +151,13 @@ export const EnvironmentPromotionCard = () => {
                 </Typography>
               </Box>
               <Link
-                to={`/catalog/default/deploymentpipeline/${pipeline.pipelineEntityRef
-                  .split('/')
-                  .pop()}`}
+                to={(() => {
+                  const ref = parseEntityRef(pipeline.pipelineEntityRef, {
+                    defaultKind: 'deploymentpipeline',
+                    defaultNamespace: 'default',
+                  });
+                  return `/catalog/${ref.namespace}/${ref.kind}/${ref.name}`;
+                })()}
                 style={{ textDecoration: 'none' }}
               >
                 <ChevronRightIcon className={localClasses.chevron} />
diff --git a/plugins/platform-engineer-core/src/types.ts b/plugins/platform-engineer-core/src/types.ts
index 8d22ef09..9dddc1b3 100644
--- a/plugins/platform-engineer-core/src/types.ts
+++ b/plugins/platform-engineer-core/src/types.ts
@@ -23,7 +23,7 @@ export interface DataPlane {
   kubernetesClusterName?: string;
   apiServerURL?: string;
   publicVirtualHost?: string;
-  organizationVirtualHost?: string;
+  namespaceVirtualHost?: string;
   observerURL?: string;
   observerUsername?: string;
   createdAt?: string;