diff --git a/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_main_template.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_main_template.tsx
index 36ab11d45851a9..26fd83adec20a8 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_main_template.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_main_template.tsx
@@ -12,6 +12,7 @@ import type { KibanaPageTemplateProps } from '@kbn/shared-ux-page-kibana-templat
 import React, { useContext } from 'react';
 import { useLocation } from 'react-router-dom';
 import { FeatureFeedbackButton } from '@kbn/observability-shared-plugin/public';
+import { useEntityManagerEnablementContext } from '../../../context/entity_manager_context/use_entity_manager_enablement_context';
 import { useDefaultAiAssistantStarterPromptsForAPM } from '../../../hooks/use_default_ai_assistant_starter_prompts_for_apm';
 import { KibanaEnvironmentContext } from '../../../context/kibana_environment_context/kibana_environment_context';
 import { getPathForFeedback } from '../../../utils/get_path_for_feedback';
@@ -28,6 +29,7 @@ import { EntityEnablement } from '../../shared/entity_enablement';
 // Paths that must skip the no data screen
 const bypassNoDataScreenPaths = ['/settings', '/diagnostics'];
 const APM_FEEDBACK_LINK = 'https://ela.st/services-feedback';
+const APM_NEW_EXPERIENCE_FEEDBACK_LINK = 'https://ela.st/entity-services-feedback';
 
 /*
  * This template contains:
@@ -69,6 +71,7 @@ export function ApmMainTemplate({
   const { kibanaVersion, isCloudEnv, isServerlessEnv } = kibanaEnvironment;
   const basePath = http?.basePath.get();
   const { config } = useApmPluginContext();
+  const { isEntityManagerEnabled } = useEntityManagerEnablementContext();
 
   const ObservabilityPageTemplate = observabilityShared.navigation.PageTemplate;
 
@@ -135,7 +138,11 @@ export function ApmMainTemplate({
           <EuiFlexItem grow={false}>
             <FeatureFeedbackButton
               data-test-subj="infraApmFeedbackLink"
-              formUrl={APM_FEEDBACK_LINK}
+              formUrl={
+                isEntityManagerEnabled && sanitizedPath.includes('service')
+                  ? APM_NEW_EXPERIENCE_FEEDBACK_LINK
+                  : APM_FEEDBACK_LINK
+              }
               kibanaVersion={kibanaVersion}
               isCloudEnv={isCloudEnv}
               isServerlessEnv={isServerlessEnv}
@@ -172,6 +179,4 @@ export function ApmMainTemplate({
   );
 
   return <EnvironmentsContextProvider>{pageTemplate}</EnvironmentsContextProvider>;
-
-  return pageTemplate;
 }
diff --git a/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/index.tsx
index e305743243a4b0..826ad22743efa3 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/index.tsx
@@ -25,7 +25,7 @@ import { TechnicalPreviewBadge } from '../technical_preview_badge';
 import { ApmPluginStartDeps } from '../../../plugin';
 import { useEntityManagerEnablementContext } from '../../../context/entity_manager_context/use_entity_manager_enablement_context';
 import { FeedbackModal } from './feedback_modal';
-import { UnauthorisedModal } from './unauthorized_modal';
+import { Unauthorized } from './unauthorized_modal';
 
 export function EntityEnablement() {
   const [isFeedbackModalVisible, setsIsFeedbackModalVisible] = useState(false);
@@ -56,7 +56,7 @@ export function EntityEnablement() {
     }
   };
 
-  const handleEnableblement = async () => {
+  const handleEnablement = async () => {
     setIsLoading(true);
     try {
       const response = await entityManager.entityClient.enableManagedEntityDiscovery();
@@ -75,7 +75,7 @@ export function EntityEnablement() {
     }
   };
 
-  const handdleOnCloseFeedback = () => {
+  const handleOnCloseFeedback = () => {
     setsIsFeedbackModalVisible(false);
     refetch();
   };
@@ -93,7 +93,7 @@ export function EntityEnablement() {
         <EuiLink
           disabled={isEntityManagerEnabled}
           data-test-subj="tryOutEEMLink"
-          onClick={handleEnableblement}
+          onClick={handleEnablement}
         >
           {isEntityManagerEnabled
             ? i18n.translate('xpack.apm.eemEnablement.enabled.', {
@@ -149,8 +149,8 @@ export function EntityEnablement() {
       </EuiFlexItem>
       {isEntityManagerEnabled && (
         <EuiFlexItem grow={false}>
-          <EuiLink data-test-subj="restoreClassiView" onClick={handleRestoreView}>
-            {i18n.translate('xpack.apm.eemEnablement.restoveClassicView.', {
+          <EuiLink data-test-subj="restoreClassicView" onClick={handleRestoreView}>
+            {i18n.translate('xpack.apm.eemEnablement.restoreClassicView.', {
               defaultMessage: 'Restore classic view',
             })}
           </EuiLink>
@@ -158,9 +158,9 @@ export function EntityEnablement() {
       )}
       <FeedbackModal
         isFeedbackModalVisible={isFeedbackModalVisible}
-        onClose={handdleOnCloseFeedback}
+        onClose={handleOnCloseFeedback}
       />
-      <UnauthorisedModal
+      <Unauthorized
         isUnauthorizedModalVisible={isUnauthorizedModalVisible}
         onClose={() => setsIsUnauthorizedModalVisible(false)}
       />
diff --git a/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/unauthorized_modal.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/unauthorized_modal.tsx
index f728790f8c50fe..8dd3682b61ff32 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/unauthorized_modal.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/unauthorized_modal.tsx
@@ -29,7 +29,7 @@ import {
 } from '@elastic/eui';
 import { useKibanaUrl } from '../../../hooks/use_kibana_url';
 
-export function UnauthorisedModal({
+export function Unauthorized({
   isUnauthorizedModalVisible = false,
   onClose,
 }: {