diff --git a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/generated_config_fields.tsx b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/generated_config_fields.tsx
index 53cbf579a940f..a905242c90fec 100644
--- a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/generated_config_fields.tsx
+++ b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/generated_config_fields.tsx
@@ -97,6 +97,9 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
     setIsModalVisible(false);
   };
 
+  const showApiKeyInfoForSelfManagedConnector = !connector.is_native;
+  const showApiKeyBanner = showApiKeyInfoForSelfManagedConnector && apiKey?.encoded;
+
   return (
     <>
       {isModalVisible && <ConfirmModal onCancel={onCancel} onConfirm={onConfirm} />}
@@ -193,96 +196,99 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
             )}
           </EuiFlexItem>
           <EuiFlexItem />
-          <EuiFlexItem>
-            <EuiFlexGroup responsive={false} gutterSize="xs">
+          {showApiKeyInfoForSelfManagedConnector && (
+            <>
+              <EuiFlexItem>
+                <EuiFlexGroup responsive={false} gutterSize="xs">
+                  <EuiFlexItem grow={false}>
+                    <EuiIcon type="check" />
+                  </EuiFlexItem>
+                  <EuiFlexItem>
+                    {i18n.translate(
+                      'xpack.enterpriseSearch.connectorDeployment.apiKeyCreatedFlexItemLabel',
+                      { defaultMessage: 'API key created' }
+                    )}
+                    {apiKey?.encoded && ` *`}
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+              </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiIcon type="check" />
+                <EuiLink
+                  data-test-subj="enterpriseSearchConnectorDeploymentLink"
+                  href={generateEncodedPath(MANAGE_API_KEYS_URL, {})}
+                  external
+                  target="_blank"
+                >
+                  {apiKey?.name}
+                </EuiLink>
               </EuiFlexItem>
               <EuiFlexItem>
-                {i18n.translate(
-                  'xpack.enterpriseSearch.connectorDeployment.apiKeyCreatedFlexItemLabel',
-                  { defaultMessage: 'API key created' }
-                )}
-                {apiKey?.encoded && ` *`}
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiLink
-              data-test-subj="enterpriseSearchConnectorDeploymentLink"
-              href={generateEncodedPath(MANAGE_API_KEYS_URL, {})}
-              external
-              target="_blank"
-            >
-              {apiKey?.name}
-            </EuiLink>
-          </EuiFlexItem>
-          <EuiFlexItem>
-            <EuiFlexGroup
-              responsive={false}
-              gutterSize="xs"
-              justifyContent="flexEnd"
-              alignItems="center"
-            >
-              {apiKey?.encoded ? (
-                <EuiFlexItem>
-                  <EuiCopy textToCopy={apiKey?.encoded}>
-                    {(copy) => (
-                      <EuiFlexGroup responsive={false} alignItems="center" gutterSize="xs">
-                        <EuiFlexItem>
-                          <EuiCode>{apiKey?.encoded}</EuiCode>
-                        </EuiFlexItem>
-                        {generateApiKey && (
-                          <EuiFlexItem grow={false}>
-                            <EuiButtonIcon
-                              data-test-subj="enterpriseSearchGeneratedConfigFieldsButton"
-                              size="xs"
-                              iconType="refresh"
-                              isLoading={isGenerateLoading}
-                              onClick={refreshButtonClick}
-                              disabled={!connector.index_name}
-                              aria-label={i18n.translate(
-                                'xpack.enterpriseSearch.connectorDeployment.refreshAPIKey',
-                                { defaultMessage: 'Refresh an Elasticsearch API key' }
-                              )}
-                            />
-                          </EuiFlexItem>
-                        )}
-                        <EuiFlexItem grow={false}>
-                          <EuiButtonIcon
-                            size="xs"
-                            data-test-subj="enterpriseSearchConnectorDeploymentButton"
-                            iconType="copyClipboard"
-                            onClick={copy}
-                            aria-label={i18n.translate(
-                              'xpack.enterpriseSearch.connectorDeployment.copyIndexName',
-                              { defaultMessage: 'Copy index name' }
+                <EuiFlexGroup
+                  responsive={false}
+                  gutterSize="xs"
+                  justifyContent="flexEnd"
+                  alignItems="center"
+                >
+                  {apiKey?.encoded ? (
+                    <EuiFlexItem>
+                      <EuiCopy textToCopy={apiKey?.encoded}>
+                        {(copy) => (
+                          <EuiFlexGroup responsive={false} alignItems="center" gutterSize="xs">
+                            <EuiFlexItem>
+                              <EuiCode>{apiKey?.encoded}</EuiCode>
+                            </EuiFlexItem>
+                            {generateApiKey && (
+                              <EuiFlexItem grow={false}>
+                                <EuiButtonIcon
+                                  data-test-subj="enterpriseSearchGeneratedConfigFieldsButton"
+                                  size="xs"
+                                  iconType="refresh"
+                                  isLoading={isGenerateLoading}
+                                  onClick={refreshButtonClick}
+                                  disabled={!connector.index_name}
+                                  aria-label={i18n.translate(
+                                    'xpack.enterpriseSearch.connectorDeployment.refreshAPIKey',
+                                    { defaultMessage: 'Refresh an Elasticsearch API key' }
+                                  )}
+                                />
+                              </EuiFlexItem>
                             )}
-                          />
-                        </EuiFlexItem>
-                      </EuiFlexGroup>
-                    )}
-                  </EuiCopy>
-                </EuiFlexItem>
-              ) : (
-                generateApiKey && (
-                  <EuiFlexItem grow={false}>
-                    <EuiButtonIcon
-                      data-test-subj="enterpriseSearchGeneratedConfigFieldsButton"
-                      size="xs"
-                      iconType="refresh"
-                      isLoading={isGenerateLoading}
-                      onClick={refreshButtonClick}
-                      disabled={!connector.index_name}
-                    />
-                  </EuiFlexItem>
-                )
-              )}
-            </EuiFlexGroup>
-          </EuiFlexItem>
+                            <EuiFlexItem grow={false}>
+                              <EuiButtonIcon
+                                size="xs"
+                                data-test-subj="enterpriseSearchConnectorDeploymentButton"
+                                iconType="copyClipboard"
+                                onClick={copy}
+                                aria-label={i18n.translate(
+                                  'xpack.enterpriseSearch.connectorDeployment.copyIndexName',
+                                  { defaultMessage: 'Copy index name' }
+                                )}
+                              />
+                            </EuiFlexItem>
+                          </EuiFlexGroup>
+                        )}
+                      </EuiCopy>
+                    </EuiFlexItem>
+                  ) : (
+                    generateApiKey && (
+                      <EuiFlexItem grow={false}>
+                        <EuiButtonIcon
+                          data-test-subj="enterpriseSearchGeneratedConfigFieldsButton"
+                          size="xs"
+                          iconType="refresh"
+                          isLoading={isGenerateLoading}
+                          onClick={refreshButtonClick}
+                          disabled={!connector.index_name}
+                        />
+                      </EuiFlexItem>
+                    )
+                  )}
+                </EuiFlexGroup>
+              </EuiFlexItem>
+            </>
+          )}
         </EuiFlexGrid>
-
-        {apiKey?.encoded && (
+        {showApiKeyBanner && (
           <>
             <EuiSpacer size="m" />
             <EuiCallOut
diff --git a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_view_logic.ts b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_view_logic.ts
index 88594a9f0ea9a..40c952544b46b 100644
--- a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_view_logic.ts
+++ b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_view_logic.ts
@@ -34,7 +34,11 @@ import {
   hasDocumentLevelSecurityFeature,
   hasIncrementalSyncFeature,
 } from '../../utils/connector_helpers';
-import { getConnectorLastSeenError, isLastSeenOld } from '../../utils/connector_status_helpers';
+import {
+  getConnectorLastSeenError,
+  hasConnectorBeenSeenRecently,
+  isLastSeenOld,
+} from '../../utils/connector_status_helpers';
 
 import {
   ConnectorNameAndDescriptionActions,
@@ -82,6 +86,7 @@ export interface ConnectorViewValues {
   isCanceling: boolean;
   isHiddenIndex: boolean;
   isLoading: boolean;
+  isWaitingOnAgentlessDeployment: boolean;
   lastUpdated: string | null;
   pipelineData: IngestPipelineParams | undefined;
   recheckIndexLoading: boolean;
@@ -206,6 +211,7 @@ export const ConnectorViewLogic = kea<MakeLogicType<ConnectorViewValues, Connect
       () => [selectors.hasAdvancedFilteringFeature, selectors.hasBasicFilteringFeature],
       (advancedFeature: boolean, basicFeature: boolean) => advancedFeature || basicFeature,
     ],
+
     hasIncrementalSyncFeature: [
       () => [selectors.connector],
       (connector?: Connector) => hasIncrementalSyncFeature(connector),
@@ -231,6 +237,14 @@ export const ConnectorViewLogic = kea<MakeLogicType<ConnectorViewValues, Connect
         [Status.IDLE && Status.LOADING].includes(fetchConnectorApiStatus) ||
         (index && [Status.IDLE && Status.LOADING].includes(fetchIndexApiStatus)),
     ],
+    isWaitingOnAgentlessDeployment: [
+      () => [selectors.connector],
+      (connector: Connector) => {
+        if (!connector || !connector.is_native) return false;
+
+        return !hasConnectorBeenSeenRecently(connector);
+      },
+    ],
     pipelineData: [
       () => [selectors.connector],
       (connector: Connector | undefined) => connector?.pipeline ?? undefined,
diff --git a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/overview.tsx b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/overview.tsx
index 3fdd3d379eacb..9024f67858d33 100644
--- a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/overview.tsx
+++ b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/overview.tsx
@@ -9,7 +9,17 @@ import React from 'react';
 
 import { useActions, useValues } from 'kea';
 
-import { EuiButton, EuiCallOut, EuiCode, EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
+import {
+  EuiButton,
+  EuiCallOut,
+  EuiCode,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLink,
+  EuiLoadingSpinner,
+  EuiSpacer,
+  EuiText,
+} from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
@@ -38,7 +48,7 @@ import { ConnectorViewLogic } from './connector_view_logic';
 
 export const ConnectorDetailOverview: React.FC = () => {
   const { indexData } = useValues(IndexViewLogic);
-  const { connector, error } = useValues(ConnectorViewLogic);
+  const { connector, error, isWaitingOnAgentlessDeployment } = useValues(ConnectorViewLogic);
   const { isCloud } = useValues(KibanaLogic);
   const { showModal } = useActions(ConvertConnectorLogic);
   const { isModalVisible } = useValues(ConvertConnectorLogic);
@@ -73,6 +83,39 @@ export const ConnectorDetailOverview: React.FC = () => {
             </>
           )
       }
+      {isWaitingOnAgentlessDeployment && (
+        <>
+          <EuiCallOut
+            color="warning"
+            title={
+              <EuiFlexGroup alignItems="center">
+                <EuiFlexItem grow={false}>
+                  <EuiLoadingSpinner />
+                </EuiFlexItem>
+                <EuiFlexItem>
+                  {i18n.translate(
+                    'xpack.enterpriseSearch.content.connectors.overview.agentlessDeploymentNotReadyCallOut.title',
+                    {
+                      defaultMessage: 'Provisioning infrastructure',
+                    }
+                  )}
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            }
+          >
+            <EuiSpacer size="s" />
+            <EuiText size="s">
+              {i18n.translate(
+                'xpack.enterpriseSearch.content.connectors.overview.agentlessDeploymentNotReadyCallOut.description',
+                {
+                  defaultMessage: 'Setting up the agentless infrastructure to run the connector.',
+                }
+              )}
+            </EuiText>
+          </EuiCallOut>
+          <EuiSpacer />
+        </>
+      )}
       {error && (
         <>
           <EuiCallOut
diff --git a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/components/choose_connector.tsx b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/components/choose_connector.tsx
index 21fa8e3f89f6d..f8d1d6e824e95 100644
--- a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/components/choose_connector.tsx
+++ b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/components/choose_connector.tsx
@@ -37,12 +37,16 @@ import { SelfManagePreference } from '../create_connector';
 
 interface ChooseConnectorSelectableProps {
   selfManaged: SelfManagePreference;
+  disabled?: boolean;
 }
 interface OptionData {
   secondaryContent?: string;
 }
 
-export const ChooseConnector: React.FC<ChooseConnectorSelectableProps> = ({ selfManaged }) => {
+export const ChooseConnector: React.FC<ChooseConnectorSelectableProps> = ({
+  selfManaged,
+  disabled,
+}) => {
   const { euiTheme } = useEuiTheme();
   const [selectedOption, setSelectedOption] = useState<Array<EuiComboBoxOptionOption<OptionData>>>(
     []
@@ -142,6 +146,7 @@ export const ChooseConnector: React.FC<ChooseConnectorSelectableProps> = ({ self
 
   return (
     <EuiComboBox
+      isDisabled={disabled}
       aria-label={i18n.translate(
         'xpack.enterpriseSearch.createConnector.chooseConnectorSelectable.euiComboBox.accessibleScreenReaderLabelLabel',
         { defaultMessage: 'Select a data source for your connector to use.' }
diff --git a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/configuration_step.tsx b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/configuration_step.tsx
index f8bff23aa56a1..6f4f6fe001e50 100644
--- a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/configuration_step.tsx
+++ b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/configuration_step.tsx
@@ -18,6 +18,8 @@ import {
   EuiText,
   EuiButton,
   EuiProgress,
+  EuiCallOut,
+  EuiLoadingSpinner,
 } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
@@ -38,7 +40,7 @@ interface ConfigurationStepProps {
 }
 
 export const ConfigurationStep: React.FC<ConfigurationStepProps> = ({ title, setCurrentStep }) => {
-  const { connector } = useValues(ConnectorViewLogic);
+  const { connector, isWaitingOnAgentlessDeployment } = useValues(ConnectorViewLogic);
   const { updateConnectorConfiguration } = useActions(ConnectorViewLogic);
   const { setFormDirty } = useActions(NewConnectorLogic);
   const { overlays } = useKibana().services;
@@ -46,10 +48,12 @@ export const ConfigurationStep: React.FC<ConfigurationStepProps> = ({ title, set
   const { status } = useValues(ConnectorConfigurationApiLogic);
   const isSyncing = false;
 
-  const isNextStepEnabled =
+  const isConnectorConfigured =
     connector?.status === ConnectorStatus.CONNECTED ||
     connector?.status === ConnectorStatus.CONFIGURED;
 
+  const isNextStepEnabled = !isWaitingOnAgentlessDeployment && isConnectorConfigured;
+
   useEffect(() => {
     setTimeout(() => {
       window.scrollTo({
@@ -64,6 +68,37 @@ export const ConfigurationStep: React.FC<ConfigurationStepProps> = ({ title, set
   return (
     <>
       <EuiFlexGroup gutterSize="m" direction="column">
+        {isWaitingOnAgentlessDeployment && (
+          <EuiCallOut
+            color="warning"
+            title={
+              <EuiFlexGroup alignItems="center">
+                <EuiFlexItem grow={false}>
+                  <EuiLoadingSpinner />
+                </EuiFlexItem>
+                <EuiFlexItem>
+                  {i18n.translate(
+                    'xpack.enterpriseSearch.createConnector.configurationStep.agentlessDeploymentNotReadyCallOut.title',
+                    {
+                      defaultMessage: 'Provisioning infrastructure',
+                    }
+                  )}
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            }
+          >
+            <EuiSpacer size="s" />
+            <EuiText size="s">
+              {i18n.translate(
+                'xpack.enterpriseSearch.createConnector.configurationStep.agentlessDeploymentNotReadyCallOut.description',
+                {
+                  defaultMessage:
+                    'Setting up the agentless infrastructure to run the connector. This process may take up to one minute.',
+                }
+              )}
+            </EuiText>
+          </EuiCallOut>
+        )}
         <EuiFlexItem>
           <EuiPanel hasShadow={false} hasBorder paddingSize="l" style={{ position: 'relative' }}>
             <EuiTitle size="m">
@@ -114,6 +149,7 @@ export const ConfigurationStep: React.FC<ConfigurationStepProps> = ({ title, set
             </EuiText>
             <EuiSpacer size="m" />
             <EuiButton
+              disabled={!isNextStepEnabled}
               data-test-subj="enterpriseSearchStartStepGenerateConfigurationButton"
               onClick={async () => {
                 if (isFormEditing) {
diff --git a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/start_step.tsx b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/start_step.tsx
index 978a87fec1220..c0d7a2af0a682 100644
--- a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/start_step.tsx
+++ b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/start_step.tsx
@@ -107,7 +107,7 @@ export const StartStep: React.FC<StartStepProps> = ({
                     { defaultMessage: 'Connector' }
                   )}
                 >
-                  <ChooseConnector selfManaged={selfManagePreference} />
+                  <ChooseConnector selfManaged={selfManagePreference} disabled={!!connector} />
                 </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={5}>
@@ -138,7 +138,7 @@ export const StartStep: React.FC<StartStepProps> = ({
                   <EuiFieldText
                     data-test-subj="enterpriseSearchStartStepFieldText"
                     fullWidth
-                    name="first"
+                    name="connectorName"
                     value={rawName}
                     onChange={handleNameChange}
                     disabled={!!connector}
@@ -173,9 +173,10 @@ export const StartStep: React.FC<StartStepProps> = ({
                 }
               >
                 <EuiFieldText
+                  disabled={!!connector}
                   data-test-subj="enterpriseSearchStartStepFieldText"
                   fullWidth
-                  name="first"
+                  name="connectorDescription"
                 />
               </EuiFormRow>
             </EuiFlexItem>
diff --git a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/utils/connector_status_helpers.ts b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/utils/connector_status_helpers.ts
index c9e2bb0dd2b45..115601749f1c8 100644
--- a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/utils/connector_status_helpers.ts
+++ b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/utils/connector_status_helpers.ts
@@ -26,6 +26,18 @@ export const getConnectorLastSeenError = (connector: Connector): string => {
   );
 };
 
+// Determines if the connector has been seen recently.
+// Note: The default heartbeat interval for the connector service is every 5 minutes.
+// This is configured using the `service.heartbeat` key in:
+// https://github.com/elastic/connectors/blob/main/connectors/config.py
+export const hasConnectorBeenSeenRecently = (
+  connector: Connector,
+  timeWindowMinutes: number = 10
+): boolean =>
+  connector.last_seen
+    ? moment(connector.last_seen).isSameOrAfter(moment().subtract(timeWindowMinutes, 'minutes'))
+    : false;
+
 const incompleteText = i18n.translate(
   'xpack.enterpriseSearch.content.searchIndices.ingestionStatus.incomplete.label',
   { defaultMessage: 'Incomplete' }