diff --git a/x-pack/plugins/profiling/public/components/check_setup.tsx b/x-pack/plugins/profiling/public/components/check_setup.tsx
index 566ff7382aacf..aff650446303f 100644
--- a/x-pack/plugins/profiling/public/components/check_setup.tsx
+++ b/x-pack/plugins/profiling/public/components/check_setup.tsx
@@ -4,7 +4,16 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiText } from '@elastic/eui';
+import {
+  EuiButton,
+  EuiCallOut,
+  EuiFlexGrid,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLink,
+  EuiLoadingSpinner,
+  EuiText,
+} from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
 import { AsyncStatus, useAsync } from '../hooks/use_async';
@@ -49,6 +58,13 @@ export function CheckSetup({ children }: { children: React.ReactElement }) {
           <EuiFlexItem grow={false}>
             <EuiLoadingSpinner size="xxl" />
           </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiText>
+              {i18n.translate('xpack.profiling.noDataConfig.loading.loaderText', {
+                defaultMessage: 'Loading data sources',
+              })}
+            </EuiText>
+          </EuiFlexItem>
         </EuiFlexGroup>
       </ProfilingAppPageTemplate>
     );
@@ -81,12 +97,54 @@ export function CheckSetup({ children }: { children: React.ReactElement }) {
           action: {
             elasticAgent: {
               description: (
-                <EuiText>
-                  {i18n.translate('xpack.profiling.noDataConfig.action.title', {
-                    defaultMessage: `Universal Profiling provides fleet-wide, whole-system, continuous profiling with zero instrumentation.
+                <EuiFlexGrid gutterSize="s">
+                  <EuiText>
+                    {i18n.translate('xpack.profiling.noDataConfig.action.title', {
+                      defaultMessage: `Universal Profiling provides fleet-wide, whole-system, continuous profiling with zero instrumentation.
               Understand what lines of code are consuming compute resources, at all times, and across your entire infrastructure.`,
-                  })}
-                </EuiText>
+                    })}
+                  </EuiText>
+                  <EuiCallOut
+                    size="s"
+                    color="warning"
+                    title={i18n.translate(
+                      'xpack.profiling.noDataConfig.action.permissionsWarning',
+                      {
+                        defaultMessage:
+                          'To setup Universal Profiling, you must be logged in as a superuser.',
+                      }
+                    )}
+                  />
+                  <EuiText size={'xs'}>
+                    <ul>
+                      <li>
+                        {i18n.translate('xpack.profiling.noDataConfig.action.dataRetention', {
+                          defaultMessage: `Normal data storage costs apply for profiling data stored in Elasticsearch.
+                      To control data retention. `,
+                        })}
+                        <EuiLink target="_blank" href={docsLink}>
+                          {i18n.translate('xpack.profiling.noDataConfig.readMore.linkLabel', {
+                            defaultMessage: 'Read more',
+                          })}
+                        </EuiLink>
+                      </li>
+                      <li>
+                        {i18n.translate('xpack.profiling.noDataConfig.action.legalBetaTerms', {
+                          defaultMessage: `By using this feature, you acknowledge that you have read and agree to `,
+                        })}
+                        <EuiLink
+                          target="_blank"
+                          href={`https://www.elastic.co/agreements/beta-release-terms`}
+                        >
+                          {i18n.translate('xpack.profiling.noDataConfig.betaTerms.linkLabel', {
+                            defaultMessage: 'Elastic Beta Release Terms',
+                          })}
+                        </EuiLink>
+                      </li>
+                    </ul>
+                  </EuiText>
+                  <EuiText size={'xs'} />
+                </EuiFlexGrid>
               ),
               onClick: (event: React.MouseEvent<HTMLElement, MouseEvent>) => {
                 event.preventDefault();
diff --git a/x-pack/plugins/profiling/public/components/no_data_page.tsx b/x-pack/plugins/profiling/public/components/no_data_page.tsx
index d045b4146dd9c..52e5e35abe9d3 100644
--- a/x-pack/plugins/profiling/public/components/no_data_page.tsx
+++ b/x-pack/plugins/profiling/public/components/no_data_page.tsx
@@ -124,7 +124,8 @@ docker.elastic.co/observability/profiling-agent:stable /root/pf-host-agent \\
           }),
           content: (
             <EuiCodeBlock paddingSize="s" isCopyable>
-              wget -O- https://releases.prodfiler.com/stable/pf-host-agent_linux_amd64.tgz | tar xz
+              wget -O pf-host-agent.tgz &quot;https://ela.st/pf-host-agent-amd64&quot; && tar xzf
+              pf-host-agent.tgz
             </EuiCodeBlock>
           ),
         },
@@ -162,8 +163,8 @@ docker.elastic.co/observability/profiling-agent:stable /root/pf-host-agent \\
               'Open the URL below and download the right DEB package for your CPU architecture:',
           }),
           content: (
-            <EuiLink target="_blank" href={`https://releases.prodfiler.com/stable/index.html`}>
-              https://releases.prodfiler.com/stable/index.html
+            <EuiLink target="_blank" href={`https://ela.st/pf-host-agent-linux`}>
+              https://ela.st/pf-host-agent-linux
             </EuiLink>
           ),
         },
@@ -212,8 +213,8 @@ docker.elastic.co/observability/profiling-agent:stable /root/pf-host-agent \\
               'Open the URL below and download the right RPM package for your CPU architecture:',
           }),
           content: (
-            <EuiLink target="_blank" href={`https://releases.prodfiler.com/stable/index.html`}>
-              https://releases.prodfiler.com/stable/index.html
+            <EuiLink target="_blank" href={`https://ela.st/pf-host-agent-linux`}>
+              https://ela.st/pf-host-agent-linux
             </EuiLink>
           ),
         },
diff --git a/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx b/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx
index 86d2ce4b28b1a..21aba30123c55 100644
--- a/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx
+++ b/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx
@@ -16,7 +16,7 @@ export function ProfilingHeaderActionMenu() {
       <EuiHeaderLink href={router.link('/add-data-instructions')} color="primary">
         <EuiFlexGroup direction="row" gutterSize="s" alignItems="center">
           <EuiFlexItem grow={false}>
-            <EuiIcon type="listAdd" />
+            <EuiIcon type="indexOpen" />
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             {i18n.translate('xpack.profiling.headerActionMenu.addData', {