diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
index ad556ea04f9..3b0e46d96a9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
@@ -40,7 +40,6 @@ const PLACEHOLDER_ROUTE_PIPELINE_FQN = ':pipelineFQN';
 const PLACEHOLDER_ROUTE_DASHBOARD_FQN = ':dashboardFQN';
 const PLACEHOLDER_ROUTE_DATABASE_FQN = ':databaseFQN';
 const PLACEHOLDER_ROUTE_SERVICE_FQN = ':serviceFQN';
-const PLACEHOLDER_ROUTE_SERVICE_TYPE = ':serviceType';
 const PLACEHOLDER_ROUTE_SERVICE_CAT = ':serviceCategory';
 const PLACEHOLDER_ROUTE_SEARCHQUERY = ':searchQuery';
 const PLACEHOLDER_ROUTE_TAB = ':tab';
@@ -132,8 +131,8 @@ export const ROUTES = {
   STORE: '/store',
   FEEDS: '/feeds',
   DUMMY: '/dummy',
-  SERVICE: `/service/${PLACEHOLDER_ROUTE_SERVICE_CAT}/${PLACEHOLDER_ROUTE_SERVICE_TYPE}/${PLACEHOLDER_ROUTE_SERVICE_FQN}`,
-  SERVICE_WITH_TAB: `/service/${PLACEHOLDER_ROUTE_SERVICE_CAT}/${PLACEHOLDER_ROUTE_SERVICE_TYPE}/${PLACEHOLDER_ROUTE_SERVICE_FQN}/${PLACEHOLDER_ROUTE_TAB}`,
+  SERVICE: `/service/${PLACEHOLDER_ROUTE_SERVICE_CAT}/${PLACEHOLDER_ROUTE_SERVICE_FQN}`,
+  SERVICE_WITH_TAB: `/service/${PLACEHOLDER_ROUTE_SERVICE_CAT}/${PLACEHOLDER_ROUTE_SERVICE_FQN}/${PLACEHOLDER_ROUTE_TAB}`,
   SERVICES: '/services',
   USERS: '/users',
   SCORECARD: '/scorecard',
@@ -195,14 +194,12 @@ export const getTableTabPath = (tableFQN: string, tab = 'schema') => {
 
 export const getServiceDetailsPath = (
   serviceFQN: string,
-  serviceType: string,
   serviceCat: string,
   tab?: string
 ) => {
   let path = tab ? ROUTES.SERVICE_WITH_TAB : ROUTES.SERVICE;
   path = path
     .replace(PLACEHOLDER_ROUTE_SERVICE_CAT, serviceCat)
-    .replace(PLACEHOLDER_ROUTE_SERVICE_TYPE, serviceType)
     .replace(PLACEHOLDER_ROUTE_SERVICE_FQN, serviceFQN);
 
   if (tab) {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.component.tsx
index 38acad85101..ff47616d829 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.component.tsx
@@ -247,7 +247,6 @@ const DashboardDetailsPage = () => {
             url: service.name
               ? getServiceDetailsPath(
                   service.name,
-                  serviceType,
                   ServiceCategory.DASHBOARD_SERVICES
                 )
               : '',
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx
index 299d37b3c86..ec80f3595f9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx
@@ -198,7 +198,6 @@ const DatasetDetailsPage: FunctionComponent = () => {
             url: service.name
               ? getServiceDetailsPath(
                   service.name,
-                  serviceType,
                   ServiceCategory.DATABASE_SERVICES
                 )
               : '',
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx
index 401bf8e35cb..3b6e2fa3c58 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx
@@ -155,15 +155,14 @@ const EntityVersionPage: FunctionComponent = () => {
                 url: service.name
                   ? getServiceDetailsPath(
                       service.name,
-                      serviceType,
                       ServiceCategory.DATABASE_SERVICES
                     )
                   : '',
                 imgSrc: serviceType ? serviceTypeLogo(serviceType) : undefined,
               },
               {
-                name: database.name,
-                url: getDatabaseDetailsPath(database.fullyQualifiedName),
+                name: getPartialNameFromFQN(database.name, ['database']),
+                url: getDatabaseDetailsPath(database.name),
               },
               {
                 name: name,
@@ -208,7 +207,6 @@ const EntityVersionPage: FunctionComponent = () => {
                 url: service.name
                   ? getServiceDetailsPath(
                       service.name,
-                      serviceType,
                       ServiceCategory.MESSAGING_SERVICES
                     )
                   : '',
@@ -258,8 +256,7 @@ const EntityVersionPage: FunctionComponent = () => {
                 url: service.name
                   ? getServiceDetailsPath(
                       service.name,
-                      serviceType,
-                      ServiceCategory.MESSAGING_SERVICES
+                      ServiceCategory.DASHBOARD_SERVICES
                     )
                   : '',
                 imgSrc: serviceType ? serviceTypeLogo(serviceType) : undefined,
@@ -308,8 +305,7 @@ const EntityVersionPage: FunctionComponent = () => {
                 url: service.name
                   ? getServiceDetailsPath(
                       service.name,
-                      serviceType,
-                      ServiceCategory.MESSAGING_SERVICES
+                      ServiceCategory.PIPELINE_SERVICES
                     )
                   : '',
                 imgSrc: serviceType ? serviceTypeLogo(serviceType) : undefined,
@@ -372,7 +368,6 @@ const EntityVersionPage: FunctionComponent = () => {
                     url: service.name
                       ? getServiceDetailsPath(
                           service.name,
-                          serviceType,
                           ServiceCategory.DATABASE_SERVICES
                         )
                       : '',
@@ -381,8 +376,8 @@ const EntityVersionPage: FunctionComponent = () => {
                       : undefined,
                   },
                   {
-                    name: database.name,
-                    url: getDatabaseDetailsPath(database.fullyQualifiedName),
+                    name: getPartialNameFromFQN(database.name, ['database']),
+                    url: getDatabaseDetailsPath(database.name),
                   },
                   {
                     name: name,
@@ -429,7 +424,6 @@ const EntityVersionPage: FunctionComponent = () => {
                     url: service.name
                       ? getServiceDetailsPath(
                           service.name,
-                          serviceType,
                           ServiceCategory.MESSAGING_SERVICES
                         )
                       : '',
@@ -481,8 +475,7 @@ const EntityVersionPage: FunctionComponent = () => {
                     url: service.name
                       ? getServiceDetailsPath(
                           service.name,
-                          serviceType,
-                          ServiceCategory.MESSAGING_SERVICES
+                          ServiceCategory.DASHBOARD_SERVICES
                         )
                       : '',
                     imgSrc: serviceType
@@ -533,8 +526,7 @@ const EntityVersionPage: FunctionComponent = () => {
                     url: service.name
                       ? getServiceDetailsPath(
                           service.name,
-                          serviceType,
-                          ServiceCategory.MESSAGING_SERVICES
+                          ServiceCategory.PIPELINE_SERVICES
                         )
                       : '',
                     imgSrc: serviceType
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.component.tsx
index d50235e506b..e4233f42344 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.component.tsx
@@ -197,7 +197,6 @@ const PipelineDetailsPage = () => {
             url: service.name
               ? getServiceDetailsPath(
                   service.name,
-                  serviceType,
                   ServiceCategory.PIPELINE_SERVICES
                 )
               : '',
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.component.tsx
index f85423ce4cf..a7b0c2267bf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.component.tsx
@@ -157,7 +157,6 @@ const TopicDetailsPage: FunctionComponent = () => {
             url: service.name
               ? getServiceDetailsPath(
                   service.name,
-                  serviceType,
                   ServiceCategory.MESSAGING_SERVICES
                 )
               : '',
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
index 3b2fbdf7c57..5d43eec14fc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
@@ -181,7 +181,6 @@ const DatabaseDetails: FunctionComponent = () => {
             url: service.name
               ? getServiceDetailsPath(
                   service.name,
-                  serviceType,
                   ServiceCategory.DATABASE_SERVICES
                 )
               : '',
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
index deff3c39463..0feb331da44 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
@@ -209,7 +209,6 @@ const ServicePage: FunctionComponent = () => {
       history.push({
         pathname: getServiceDetailsPath(
           serviceFQN,
-          serviceType,
           serviceCategory,
           servicePageTabs(getCountLabel())[currentTabIndex].path
         ),
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx
index b116d00fd07..5aad5312a77 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx
@@ -535,7 +535,6 @@ const ServicesPage = () => {
                           <Link
                             to={getServiceDetailsPath(
                               service.name,
-                              service.serviceType || '',
                               serviceName
                             )}>
                             <button>
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx
index 86dd98e654c..04d801b365b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx
@@ -104,7 +104,6 @@ export const getEntityOverview = (
           value: service,
           url: getServiceDetailsPath(
             service,
-            serviceType,
             ServiceCategory.DATABASE_SERVICES
           ),
           isLink: true,
@@ -195,7 +194,6 @@ export const getEntityOverview = (
           value: service?.name as string,
           url: getServiceDetailsPath(
             service?.name as string,
-            serviceType,
             ServiceCategory.PIPELINE_SERVICES
           ),
           isLink: true,
@@ -238,7 +236,6 @@ export const getEntityOverview = (
           value: service?.name as string,
           url: getServiceDetailsPath(
             service?.name as string,
-            serviceType,
             ServiceCategory.DASHBOARD_SERVICES
           ),
           isLink: true,