diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_search_preview/engine_search_preview.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_search_preview/engine_search_preview.tsx
index e75da0a64792c..ffea55611693e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_search_preview/engine_search_preview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_search_preview/engine_search_preview.tsx
@@ -18,6 +18,7 @@ import {
   EuiHorizontalRule,
   EuiIcon,
   EuiLink,
+  EuiPageSection,
   EuiPanel,
   EuiPopover,
   EuiSpacer,
@@ -72,6 +73,7 @@ import {
   ResultsView,
   Sorting,
 } from './search_ui_components';
+import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
 
 class InternalEngineTransporter implements Transporter {
   constructor(
@@ -304,6 +306,7 @@ export const EngineSearchPreview: React.FC = () => {
 
   return (
     <EnterpriseSearchEnginesPageTemplate
+      customPageSections
       pageChrome={[
         engineName,
         i18n.translate('xpack.enterpriseSearch.content.engine.searchPreview.pageChrome', {
@@ -312,57 +315,77 @@ export const EngineSearchPreview: React.FC = () => {
       ]}
       pageViewTelemetry={EngineViewTabs.PREVIEW}
       isLoading={isLoadingEngine}
-      pageHeader={{
-        bottomBorder: false,
-        pageTitle: (
-          <FormattedMessage
-            id="xpack.enterpriseSearch.content.engine.searchPreview.pageTitle"
-            defaultMessage="{engineName}"
-            values={{ engineName }}
-          />
-        ),
-        rightSideItems: [
-          <>
-            <ConfigurationPopover
-              engineName={engineName}
-              showConfiguration={showConfigurationPopover}
-              setCloseConfiguration={() => setShowConfigurationPopover(!showConfigurationPopover)}
-            />
-          </>,
-        ],
-      }}
+      // pageHeader={{
+      //   bottomBorder: false,
+      //   pageTitle: (
+      //     <FormattedMessage
+      //       id="xpack.enterpriseSearch.content.engine.searchPreview.pageTitle"
+      //       defaultMessage="{engineName}"
+      //       values={{ engineName }}
+      //     />
+      //   ),
+      //   rightSideItems: [
+      //     <>
+      //       <ConfigurationPopover
+      //         engineName={engineName}
+      //         showConfiguration={showConfigurationPopover}
+      //         setCloseConfiguration={() => setShowConfigurationPopover(!showConfigurationPopover)}
+      //       />
+      //     </>,
+      //   ],
+      // }}
       engineName={engineName}
     >
-      <DocumentProvider>
-        <SearchProvider config={config}>
-          <EuiFlexGroup>
-            <EuiFlexItem>
-              <SearchBox inputView={InputView} />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <EuiSpacer size="m" />
-          <EuiFlexGroup>
-            <EuiFlexItem grow={false} css={{ minWidth: '240px' }}>
-              <ResultsPerPage view={ResultsPerPageView} options={RESULTS_PER_PAGE_OPTIONS} />
-              <EuiSpacer size="m" />
-              <Sorting sortableFields={sortableFields} />
-              <EuiSpacer size="m" />
-              <EuiLink href={docLinks.enterpriseSearchEngines} target="_blank">
-                <FormattedMessage
-                  id="xpack.enterpriseSearch.content.engine.searchPreview.improveResultsLink"
-                  defaultMessage="Improve these results"
-                />
-              </EuiLink>
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <PagingInfo view={PagingInfoView} />
-              <EuiSpacer size="m" />
-              <Results view={ResultsView} resultView={ResultView} />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </SearchProvider>
-        <DocumentFlyout />
-        {/*
+      <KibanaPageTemplate.Section color="subdued">
+        <KibanaPageTemplate.Header
+          bottomBorder={false}
+          pageTitle={
+            <FormattedMessage
+              id="xpack.enterpriseSearch.content.engine.searchPreview.pageTitle"
+              defaultMessage="{engineName}"
+              values={{ engineName }}
+            />
+          }
+          rightSideItems={[
+            <>
+              <ConfigurationPopover
+                engineName={engineName}
+                showConfiguration={showConfigurationPopover}
+                setCloseConfiguration={() => setShowConfigurationPopover(!showConfigurationPopover)}
+              />
+            </>,
+          ]}
+        />
+        <DocumentProvider>
+          <SearchProvider config={config}>
+            <EuiFlexGroup>
+              <EuiFlexItem>
+                <SearchBox inputView={InputView} />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+            <EuiSpacer size="m" />
+            <EuiFlexGroup>
+              <EuiFlexItem grow={false} css={{ minWidth: '240px' }}>
+                <ResultsPerPage view={ResultsPerPageView} options={RESULTS_PER_PAGE_OPTIONS} />
+                <EuiSpacer size="m" />
+                <Sorting sortableFields={sortableFields} />
+                <EuiSpacer size="m" />
+                <EuiLink href={docLinks.enterpriseSearchEngines} target="_blank">
+                  <FormattedMessage
+                    id="xpack.enterpriseSearch.content.engine.searchPreview.improveResultsLink"
+                    defaultMessage="Improve these results"
+                  />
+                </EuiLink>
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <PagingInfo view={PagingInfoView} />
+                <EuiSpacer size="m" />
+                <Results view={ResultsView} resultView={ResultView} />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </SearchProvider>
+          <DocumentFlyout />
+          {/*
         Uncomment when view this API call needed
 
         {showAPICallFlyout && lastAPICall && (
@@ -373,7 +396,8 @@ export const EngineSearchPreview: React.FC = () => {
           />
         )}
         */}
-      </DocumentProvider>
+        </DocumentProvider>
+      </KibanaPageTemplate.Section>
     </EnterpriseSearchEnginesPageTemplate>
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.tsx
index 1f26c588510ae..7b93214e0af8b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.tsx
@@ -163,7 +163,6 @@ export const EnginesList: React.FC<ListProps> = ({ createEngineFlyoutOpen }) =>
           }),
         ]}
         pageHeader={{
-          bottomBorder: false,
           description: (
             <FormattedMessage
               id="xpack.enterpriseSearch.content.searchApplications.description"
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/engines_page_template.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/engines_page_template.tsx
index 68d79f572955b..cec8b4a9e93b1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/engines_page_template.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/engines_page_template.tsx
@@ -23,13 +23,14 @@ export const EnterpriseSearchEnginesPageTemplate: React.FC<
   EnterpriseSearchEnginesPageTemplateProps
 > = ({ children, pageChrome, pageViewTelemetry, engineName, ...pageTemplateProps }) => {
   const navItems = useEnterpriseSearchEngineNav(engineName, pageTemplateProps.isEmptyState);
-  const color = useEuiBackgroundColor('subdued');
-  pageTemplateProps.pageHeader = {
-    ...pageTemplateProps.pageHeader,
-    css: { 'background-color': color },
-  };
+
+  // pageTemplateProps.pageHeader = {
+  //   ...pageTemplateProps.pageHeader,
+  //   css: { 'background-color': color },
+  // };
   return (
     <EnterpriseSearchPageTemplateWrapper
+      panelled
       {...pageTemplateProps}
       solutionNav={{
         items: navItems,