diff --git a/src/core/packages/chrome/browser-mocks/src/chrome_service.mock.ts b/src/core/packages/chrome/browser-mocks/src/chrome_service.mock.ts
index a1f1d7191ebb1..7a7865bf02f7e 100644
--- a/src/core/packages/chrome/browser-mocks/src/chrome_service.mock.ts
+++ b/src/core/packages/chrome/browser-mocks/src/chrome_service.mock.ts
@@ -96,7 +96,7 @@ const createStartContractMock = () => {
       navigationTourManager: {} as any,
     }),
     setGlobalFooter: jest.fn(),
-    getGlobalFooter$: jest.fn(),
+    getGlobalFooter$: jest.fn().mockReturnValue(new BehaviorSubject(null)),
   });
 
   return startContract;
diff --git a/src/core/packages/chrome/layout/core-chrome-layout-feature-flags/index.ts b/src/core/packages/chrome/layout/core-chrome-layout-feature-flags/index.ts
index c52e741912675..7c2d55f241bbe 100644
--- a/src/core/packages/chrome/layout/core-chrome-layout-feature-flags/index.ts
+++ b/src/core/packages/chrome/layout/core-chrome-layout-feature-flags/index.ts
@@ -16,7 +16,7 @@ export const LAYOUT_DEBUG_FEATURE_FLAG_KEY = 'core.chrome.layoutDebug';
 export const getLayoutVersion = (featureFlags: FeatureFlagsStart): LayoutFeatureFlag => {
   const featureFlag = featureFlags.getStringValue<LayoutFeatureFlag>(
     LAYOUT_FEATURE_FLAG_KEY,
-    'legacy-fixed'
+    'grid'
   );
   if (featureFlag !== 'legacy-fixed' && featureFlag !== 'grid') {
     throw new Error(
diff --git a/src/core/packages/rendering/browser-internal/src/rendering_service.test.tsx b/src/core/packages/rendering/browser-internal/src/rendering_service.test.tsx
index 386f1a713365c..40498950ec6be 100644
--- a/src/core/packages/rendering/browser-internal/src/rendering_service.test.tsx
+++ b/src/core/packages/rendering/browser-internal/src/rendering_service.test.tsx
@@ -56,7 +56,7 @@ describe('RenderingService', () => {
     application.getComponent.mockReturnValue(<div>Hello application!</div>);
 
     chrome = chromeServiceMock.createStartContract();
-    chrome.getLegacyHeaderComponentForFixedLayout.mockReturnValue(<div>Hello chrome!</div>);
+    chrome.getClassicHeaderComponentForGridLayout.mockReturnValue(<div>Hello chrome!</div>);
 
     overlays = overlayServiceMock.createStartContract();
     overlays.banners.getComponent.mockReturnValue(<div>I&apos;m a banner!</div>);
diff --git a/src/platform/packages/shared/react/kibana_context/root/eui_provider.test.tsx b/src/platform/packages/shared/react/kibana_context/root/eui_provider.test.tsx
index 1f68150beda4c..c3a57b38bb884 100644
--- a/src/platform/packages/shared/react/kibana_context/root/eui_provider.test.tsx
+++ b/src/platform/packages/shared/react/kibana_context/root/eui_provider.test.tsx
@@ -117,6 +117,12 @@ describe('KibanaEuiProvider', () => {
           EuiFlyout: {
             includeSelectorInFocusTrap: euiIncludeSelectorInFocusTrap.selector,
           },
+          EuiPopover: {
+            repositionOnScroll: true,
+          },
+          EuiToolTip: {
+            repositionOnScroll: true,
+          },
         },
       }),
       expect.anything()
diff --git a/src/platform/packages/shared/react/kibana_context/root/eui_provider.tsx b/src/platform/packages/shared/react/kibana_context/root/eui_provider.tsx
index d083c81366b76..4ab5882ce77bf 100644
--- a/src/platform/packages/shared/react/kibana_context/root/eui_provider.tsx
+++ b/src/platform/packages/shared/react/kibana_context/root/eui_provider.tsx
@@ -83,6 +83,12 @@ const componentDefaults: EuiProviderProps<unknown>['componentDefaults'] = {
   EuiFlyout: {
     includeSelectorInFocusTrap: `[data-eui-includes-in-flyout-focus-trap="true"]`,
   },
+  EuiPopover: {
+    repositionOnScroll: true,
+  },
+  EuiToolTip: {
+    repositionOnScroll: true,
+  },
 };
 
 /**
diff --git a/x-pack/platform/plugins/shared/osquery/cypress/e2e/all/alerts_response_actions_form.cy.ts b/x-pack/platform/plugins/shared/osquery/cypress/e2e/all/alerts_response_actions_form.cy.ts
index a23151b0d78d3..40bcbb7d77496 100644
--- a/x-pack/platform/plugins/shared/osquery/cypress/e2e/all/alerts_response_actions_form.cy.ts
+++ b/x-pack/platform/plugins/shared/osquery/cypress/e2e/all/alerts_response_actions_form.cy.ts
@@ -162,10 +162,12 @@ describe(
         cy.contains('Custom key/value pairs. e.g. {"application":"foo-bar","env":"production"}');
         cy.contains('Days of uptime');
       });
-      cy.getBySel(RESPONSE_ACTIONS_ITEM_1).within(() => {
-        cy.getBySel('comboBoxSearchInput').should('have.value', packName);
-        cy.getBySel('comboBoxInput').type('{selectall}{backspace}{enter}');
-      });
+      cy.getBySel(RESPONSE_ACTIONS_ITEM_1)
+        .within(() => {
+          cy.getBySel('comboBoxSearchInput').should('have.value', packName);
+          cy.getBySel('comboBoxInput').type('{selectall}{backspace}{enter}');
+        })
+        .clickOutside();
       cy.getBySel(RESPONSE_ACTIONS_ITEM_0).within(() => {
         cy.contains('select * from uptime1');
         cy.getBySel('remove-response-action').click();
diff --git a/x-pack/solutions/observability/test/functional_solution_sidenav/tests/observability_sidenav.ts b/x-pack/solutions/observability/test/functional_solution_sidenav/tests/observability_sidenav.ts
index 93ed4dddc21e1..321c4e5b63b21 100644
--- a/x-pack/solutions/observability/test/functional_solution_sidenav/tests/observability_sidenav.ts
+++ b/x-pack/solutions/observability/test/functional_solution_sidenav/tests/observability_sidenav.ts
@@ -58,7 +58,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         }
 
         // open Infrastructure popover and navigate to some link inside the panel
-        await solutionNavigation.sidenav.expandMore();
         await solutionNavigation.sidenav.clickLink({ navId: 'metrics' });
         // open first link in popover to open a panel
         await solutionNavigation.sidenav.clickLink({ navId: 'metrics:inventory' });
diff --git a/x-pack/solutions/observability/test/serverless/functional/test_suites/infra/navigation.ts b/x-pack/solutions/observability/test/serverless/functional/test_suites/infra/navigation.ts
index b5ae93fd45bed..2c9f8763c63d1 100644
--- a/x-pack/solutions/observability/test/serverless/functional/test_suites/infra/navigation.ts
+++ b/x-pack/solutions/observability/test/serverless/functional/test_suites/infra/navigation.ts
@@ -12,7 +12,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['svlCommonPage', 'svlCommonNavigation', 'header']);
 
   const openInfraSection = async () => {
-    await pageObjects.svlCommonNavigation.sidenav.expandMore();
     await pageObjects.svlCommonNavigation.sidenav.openPanel('metrics');
   };