diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx
index 09814ebab8b7c..3f05c4d305110 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx
@@ -96,307 +96,278 @@ export const ConnectorConfiguration: React.FC = () => {
       <EuiFlexGroup>
         <EuiFlexItem grow={2}>
           <EuiPanel hasShadow={false} hasBorder>
-            <EuiSteps
-              steps={[
-                {
-                  children: connector.index_name ? (
-                    <ApiKeyConfig
-                      indexName={connector.index_name}
-                      hasApiKey={!!connector.api_key_id}
-                      isNative={false}
-                    />
-                  ) : (
-                    i18n.translate(
-                      'xpack.enterpriseSearch.content.connectorDetail.configuration.apiKey.noApiKeyLabel',
-                      {
-                        defaultMessage:
-                          'Before you can generate an API key, you need to attach an index. Scroll to the bottom of this page for instructions.',
-                      }
-                    )
-                  ),
-                  status: hasApiKey ? 'complete' : 'incomplete',
-                  title: i18n.translate(
-                    'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.generateApiKey.title',
+            {
+              <>
+                <EuiSpacer />
+                <AttachIndexBox connector={connector} />
+              </>
+            }
+            {connector.index_name && (
+              <>
+                <EuiSpacer />
+                <EuiSteps
+                  steps={[
                     {
-                      defaultMessage: 'Generate an API key',
-                    }
-                  ),
-                  titleSize: 'xs',
-                },
-                {
-                  children: (
-                    <>
-                      <EuiSpacer />
-                      <EuiText size="s">
-                        <FormattedMessage
-                          id="xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.thirdParagraph"
-                          defaultMessage="In this step, you will need to clone or fork the elastic/connectors repository, and copy the API key and connector ID values to the config.yml file. Here's an {exampleLink}."
-                          values={{
-                            exampleLink: (
-                              <EuiLink
-                                data-test-subj="entSearchContent-connector-configuration-exampleConfigFileLink"
-                                data-telemetry-id="entSearchContent-connector-configuration-exampleConfigFileLink"
-                                href="https://github.com/elastic/connectors-python/blob/main/config.yml.example"
-                                target="_blank"
-                                external
-                              >
-                                {i18n.translate(
-                                  'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.configurationFileLink',
-                                  { defaultMessage: 'example config file' }
-                                )}
-                              </EuiLink>
-                            ),
-                          }}
-                        />
-                      </EuiText>
-                      <EuiSpacer />
-                      <EuiCodeBlock fontSize="m" paddingSize="m" color="dark" isCopyable>
-                        {getConnectorTemplate({
-                          apiKeyData,
-                          connectorData: {
-                            id: connector.id,
-                            service_type: connector.service_type,
-                          },
-                          host: cloudContext.elasticsearchUrl,
-                        })}
-                      </EuiCodeBlock>
-                      <EuiSpacer />
-                      <EuiText size="s">
-                        <FormattedMessage
-                          id="xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.fourthParagraph"
-                          defaultMessage="Because this connector is self-managed, you need to deploy the connector service on your own infrastructure. You can build from source or use Docker. Refer to the {link} for your deployment options."
-                          values={{
-                            link: (
-                              <EuiLink
-                                data-test-subj="entSearchContent-connector-configuration-deploymentModeLink"
-                                data-telemetry-id="entSearchContent-connector-configuration-deploymentModeLink"
-                                href={docLinks.connectorsClientDeploy}
-                                target="_blank"
-                                external
-                              >
-                                {i18n.translate(
-                                  'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.deploymentModeLink',
-                                  { defaultMessage: 'documentation' }
-                                )}
-                              </EuiLink>
-                            ),
-                          }}
+                      children: (
+                        <ApiKeyConfig
+                          indexName={connector.index_name}
+                          hasApiKey={!!connector.api_key_id}
+                          isNative={false}
                         />
-                      </EuiText>
-                    </>
-                  ),
-                  status:
-                    !connector.status || connector.status === ConnectorStatus.CREATED
-                      ? 'incomplete'
-                      : 'complete',
-                  title: i18n.translate(
-                    'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.deployConnector.title',
+                      ),
+                      status: hasApiKey ? 'complete' : 'incomplete',
+                      title: i18n.translate(
+                        'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.generateApiKey.title',
+                        {
+                          defaultMessage: 'Generate an API key',
+                        }
+                      ),
+                      titleSize: 'xs',
+                    },
                     {
-                      defaultMessage: 'Set up and deploy connector',
-                    }
-                  ),
-                  titleSize: 'xs',
-                },
-                {
-                  children: (
-                    <ConnectorConfigurationComponent
-                      connector={connector}
-                      hasPlatinumLicense={hasPlatinumLicense}
-                      isLoading={updateConnectorConfigurationStatus === Status.LOADING}
-                      saveConfig={(configuration) =>
-                        updateConnectorConfiguration({
-                          configuration,
-                          connectorId: connector.id,
-                        })
-                      }
-                      subscriptionLink={docLinks.licenseManagement}
-                      stackManagementLink={http.basePath.prepend(
-                        '/app/management/stack/license_management'
-                      )}
-                    >
-                      {!connector.status || connector.status === ConnectorStatus.CREATED ? (
-                        <EuiCallOut
-                          title={i18n.translate(
-                            'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnectorTitle',
-                            {
-                              defaultMessage: 'Waiting for your connector',
-                            }
-                          )}
-                          iconType="iInCircle"
-                        >
-                          {i18n.translate(
-                            'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnectorText',
-                            {
-                              defaultMessage:
-                                'Your connector has not connected to Search. Troubleshoot your configuration and refresh the page.',
-                            }
-                          )}
-                          <EuiSpacer size="s" />
-                          <EuiButton
-                            disabled={!index}
-                            data-test-subj="entSearchContent-connector-configuration-recheckNow"
-                            data-telemetry-id="entSearchContent-connector-configuration-recheckNow"
-                            iconType="refresh"
-                            onClick={() => fetchConnector({ connectorId: connector.id })}
-                            isLoading={isLoading}
-                          >
-                            {i18n.translate(
-                              'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnector.button.label',
-                              {
-                                defaultMessage: 'Recheck now',
-                              }
-                            )}
-                          </EuiButton>
-                        </EuiCallOut>
-                      ) : (
-                        <EuiCallOut
-                          iconType="check"
-                          color="success"
-                          title={i18n.translate(
-                            'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.connectorConnected',
-                            {
-                              defaultMessage:
-                                'Your connector {name} has connected to Search successfully.',
-                              values: { name: connector.name },
-                            }
-                          )}
-                        />
-                      )}
-                      <EuiSpacer size="s" />
-                      {connector.status && hasAdvancedFilteringFeature && !!advancedSnippet && (
-                        <EuiCallOut
-                          title={i18n.translate(
-                            'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.advancedRulesCallout',
-                            { defaultMessage: 'Configuration warning' }
+                      children: (
+                        <>
+                          <EuiSpacer />
+                          <EuiText size="s">
+                            <FormattedMessage
+                              id="xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.thirdParagraph"
+                              defaultMessage="In this step, you will need to clone or fork the elastic/connectors repository, and copy the API key and connector ID values to the config.yml file. Here's an {exampleLink}."
+                              values={{
+                                exampleLink: (
+                                  <EuiLink
+                                    data-test-subj="entSearchContent-connector-configuration-exampleConfigFileLink"
+                                    data-telemetry-id="entSearchContent-connector-configuration-exampleConfigFileLink"
+                                    href="https://github.com/elastic/connectors-python/blob/main/config.yml.example"
+                                    target="_blank"
+                                    external
+                                  >
+                                    {i18n.translate(
+                                      'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.configurationFileLink',
+                                      { defaultMessage: 'example config file' }
+                                    )}
+                                  </EuiLink>
+                                ),
+                              }}
+                            />
+                          </EuiText>
+                          <EuiSpacer />
+                          <EuiCodeBlock fontSize="m" paddingSize="m" color="dark" isCopyable>
+                            {getConnectorTemplate({
+                              apiKeyData,
+                              connectorData: {
+                                id: connector.id,
+                                service_type: connector.service_type,
+                              },
+                              host: cloudContext.elasticsearchUrl,
+                            })}
+                          </EuiCodeBlock>
+                          <EuiSpacer />
+                          <EuiText size="s">
+                            <FormattedMessage
+                              id="xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.fourthParagraph"
+                              defaultMessage="Because this connector is self-managed, you need to deploy the connector service on your own infrastructure. You can build from source or use Docker. Refer to the {link} for your deployment options."
+                              values={{
+                                link: (
+                                  <EuiLink
+                                    data-test-subj="entSearchContent-connector-configuration-deploymentModeLink"
+                                    data-telemetry-id="entSearchContent-connector-configuration-deploymentModeLink"
+                                    href={docLinks.connectorsClientDeploy}
+                                    target="_blank"
+                                    external
+                                  >
+                                    {i18n.translate(
+                                      'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.deploymentModeLink',
+                                      { defaultMessage: 'documentation' }
+                                    )}
+                                  </EuiLink>
+                                ),
+                              }}
+                            />
+                          </EuiText>
+                        </>
+                      ),
+                      status:
+                        !connector.status || connector.status === ConnectorStatus.CREATED
+                          ? 'incomplete'
+                          : 'complete',
+                      title: i18n.translate(
+                        'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.deployConnector.title',
+                        {
+                          defaultMessage: 'Set up and deploy connector',
+                        }
+                      ),
+                      titleSize: 'xs',
+                    },
+                    {
+                      children: (
+                        <ConnectorConfigurationComponent
+                          connector={connector}
+                          hasPlatinumLicense={hasPlatinumLicense}
+                          isLoading={updateConnectorConfigurationStatus === Status.LOADING}
+                          saveConfig={(configuration) =>
+                            updateConnectorConfiguration({
+                              configuration,
+                              connectorId: connector.id,
+                            })
+                          }
+                          subscriptionLink={docLinks.licenseManagement}
+                          stackManagementLink={http.basePath.prepend(
+                            '/app/management/stack/license_management'
                           )}
-                          iconType="iInCircle"
-                          color="warning"
                         >
-                          <FormattedMessage
-                            id="xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.advancedRulesCallout.description"
-                            defaultMessage="{advancedSyncRulesDocs} can override some configuration fields."
-                            values={{
-                              advancedSyncRulesDocs: (
-                                <EuiLink
-                                  data-test-subj="entSearchContent-connector-configuration-advancedSyncRulesDocsLink"
-                                  data-telemetry-id="entSearchContent-connector-configuration-advancedSyncRulesDocsLink"
-                                  href={docLinks.syncRules}
-                                  target="_blank"
-                                >
-                                  {i18n.translate(
-                                    'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.advancedSyncRulesDocs',
-                                    { defaultMessage: 'Advanced Sync Rules' }
-                                  )}
-                                </EuiLink>
-                              ),
-                            }}
-                          />
-                        </EuiCallOut>
-                      )}
-                    </ConnectorConfigurationComponent>
-                  ),
-                  status:
-                    connector.status === ConnectorStatus.CONNECTED ? 'complete' : 'incomplete',
-                  title: i18n.translate(
-                    'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.enhance.title',
-                    {
-                      defaultMessage: 'Configure your connector',
-                    }
-                  ),
-                  titleSize: 'xs',
-                },
-                {
-                  children: (
-                    <EuiFlexGroup direction="column">
-                      {!connector.index_name && (
-                        <EuiFlexItem>
-                          <EuiCallOut
-                            iconType="iInCircle"
-                            color="danger"
-                            title={i18n.translate(
-                              'xpack.enterpriseSearch.content.connectors.configuration.connectorNoIndexCallOut.title',
-                              {
-                                defaultMessage: 'Connector has no attached index',
-                              }
-                            )}
-                          >
-                            <EuiSpacer size="s" />
-                            <EuiText size="s">
+                          {!connector.status || connector.status === ConnectorStatus.CREATED ? (
+                            <EuiCallOut
+                              title={i18n.translate(
+                                'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnectorTitle',
+                                {
+                                  defaultMessage: 'Waiting for your connector',
+                                }
+                              )}
+                              iconType="iInCircle"
+                            >
                               {i18n.translate(
-                                'xpack.enterpriseSearch.content.connectors.configuration.connectorNoIndexCallOut.description',
+                                'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnectorText',
                                 {
                                   defaultMessage:
-                                    "You won't be able to start syncing content until your connector is attached to an index.",
+                                    'Your connector has not connected to Search. Troubleshoot your configuration and refresh the page.',
                                 }
                               )}
-                            </EuiText>
-                            <EuiSpacer />
-                          </EuiCallOut>
-                        </EuiFlexItem>
-                      )}
-                      <EuiFlexItem>
-                        <EuiText size="s">
-                          {i18n.translate(
-                            'xpack.enterpriseSearch.content.connector_detail.configurationConnector.scheduleSync.description',
-                            {
-                              defaultMessage:
-                                'Finalize your connector by triggering a one-time sync, or setting a recurring sync to keep your data source in sync over time',
-                            }
+                              <EuiSpacer size="s" />
+                              <EuiButton
+                                disabled={!index}
+                                data-test-subj="entSearchContent-connector-configuration-recheckNow"
+                                data-telemetry-id="entSearchContent-connector-configuration-recheckNow"
+                                iconType="refresh"
+                                onClick={() => fetchConnector({ connectorId: connector.id })}
+                                isLoading={isLoading}
+                              >
+                                {i18n.translate(
+                                  'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnector.button.label',
+                                  {
+                                    defaultMessage: 'Recheck now',
+                                  }
+                                )}
+                              </EuiButton>
+                            </EuiCallOut>
+                          ) : (
+                            <EuiCallOut
+                              iconType="check"
+                              color="success"
+                              title={i18n.translate(
+                                'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.connectorConnected',
+                                {
+                                  defaultMessage:
+                                    'Your connector {name} has connected to Search successfully.',
+                                  values: { name: connector.name },
+                                }
+                              )}
+                            />
                           )}
-                        </EuiText>
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <EuiFlexGroup responsive={false}>
-                          <EuiFlexItem grow={false}>
-                            <EuiButtonTo
-                              data-test-subj="entSearchContent-connector-configuration-setScheduleAndSync"
-                              data-telemetry-id="entSearchContent-connector-configuration-setScheduleAndSync"
-                              isDisabled={
-                                (connector?.is_native && !!errorConnectingMessage) ||
-                                [
-                                  ConnectorStatus.NEEDS_CONFIGURATION,
-                                  ConnectorStatus.CREATED,
-                                ].includes(connector?.status) ||
-                                !connector?.index_name
-                              }
-                              to={`${generateEncodedPath(CONNECTOR_DETAIL_TAB_PATH, {
-                                connectorId: connector.id,
-                                tabId: ConnectorDetailTabId.SCHEDULING,
-                              })}`}
+                          <EuiSpacer size="s" />
+                          {connector.status && hasAdvancedFilteringFeature && !!advancedSnippet && (
+                            <EuiCallOut
+                              title={i18n.translate(
+                                'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.advancedRulesCallout',
+                                { defaultMessage: 'Configuration warning' }
+                              )}
+                              iconType="iInCircle"
+                              color="warning"
                             >
+                              <FormattedMessage
+                                id="xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.advancedRulesCallout.description"
+                                defaultMessage="{advancedSyncRulesDocs} can override some configuration fields."
+                                values={{
+                                  advancedSyncRulesDocs: (
+                                    <EuiLink
+                                      data-test-subj="entSearchContent-connector-configuration-advancedSyncRulesDocsLink"
+                                      data-telemetry-id="entSearchContent-connector-configuration-advancedSyncRulesDocsLink"
+                                      href={docLinks.syncRules}
+                                      target="_blank"
+                                    >
+                                      {i18n.translate(
+                                        'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.advancedSyncRulesDocs',
+                                        { defaultMessage: 'Advanced Sync Rules' }
+                                      )}
+                                    </EuiLink>
+                                  ),
+                                }}
+                              />
+                            </EuiCallOut>
+                          )}
+                        </ConnectorConfigurationComponent>
+                      ),
+                      status:
+                        connector.status === ConnectorStatus.CONNECTED ? 'complete' : 'incomplete',
+                      title: i18n.translate(
+                        'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.enhance.title',
+                        {
+                          defaultMessage: 'Configure your connector',
+                        }
+                      ),
+                      titleSize: 'xs',
+                    },
+                    {
+                      children: (
+                        <EuiFlexGroup direction="column">
+                          <EuiFlexItem>
+                            <EuiText size="s">
                               {i18n.translate(
-                                'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.schedule.button.label',
+                                'xpack.enterpriseSearch.content.connector_detail.configurationConnector.scheduleSync.description',
                                 {
-                                  defaultMessage: 'Set schedule and sync',
+                                  defaultMessage:
+                                    'Finalize your connector by triggering a one-time sync, or setting a recurring sync to keep your data source in sync over time',
                                 }
                               )}
-                            </EuiButtonTo>
+                            </EuiText>
                           </EuiFlexItem>
-                          <EuiFlexItem grow={false}>
-                            <SyncsContextMenu />
+                          <EuiFlexItem>
+                            <EuiFlexGroup responsive={false}>
+                              <EuiFlexItem grow={false}>
+                                <EuiButtonTo
+                                  data-test-subj="entSearchContent-connector-configuration-setScheduleAndSync"
+                                  data-telemetry-id="entSearchContent-connector-configuration-setScheduleAndSync"
+                                  isDisabled={
+                                    (connector?.is_native && !!errorConnectingMessage) ||
+                                    [
+                                      ConnectorStatus.NEEDS_CONFIGURATION,
+                                      ConnectorStatus.CREATED,
+                                    ].includes(connector?.status) ||
+                                    !connector?.index_name
+                                  }
+                                  to={`${generateEncodedPath(CONNECTOR_DETAIL_TAB_PATH, {
+                                    connectorId: connector.id,
+                                    tabId: ConnectorDetailTabId.SCHEDULING,
+                                  })}`}
+                                >
+                                  {i18n.translate(
+                                    'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.schedule.button.label',
+                                    {
+                                      defaultMessage: 'Set schedule and sync',
+                                    }
+                                  )}
+                                </EuiButtonTo>
+                              </EuiFlexItem>
+                              <EuiFlexItem grow={false}>
+                                <SyncsContextMenu />
+                              </EuiFlexItem>
+                            </EuiFlexGroup>
                           </EuiFlexItem>
                         </EuiFlexGroup>
-                      </EuiFlexItem>
-                    </EuiFlexGroup>
-                  ),
-                  status: connector.scheduling.full.enabled ? 'complete' : 'incomplete',
-                  title: i18n.translate(
-                    'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.schedule.title',
-                    {
-                      defaultMessage: 'Sync your data',
-                    }
-                  ),
-                  titleSize: 'xs',
-                },
-              ]}
-            />
+                      ),
+                      status: connector.scheduling.full.enabled ? 'complete' : 'incomplete',
+                      title: i18n.translate(
+                        'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.schedule.title',
+                        {
+                          defaultMessage: 'Sync your data',
+                        }
+                      ),
+                      titleSize: 'xs',
+                    },
+                  ]}
+                />
+              </>
+            )}
           </EuiPanel>
-          {
-            <>
-              <EuiSpacer />
-              <AttachIndexBox connector={connector} />
-            </>
-          }
         </EuiFlexItem>
         <EuiFlexItem grow={1}>
           <EuiFlexGroup direction="column">
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/native_connector_configuration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/native_connector_configuration.tsx
index cc89fc84c2432..4660ad75fe905 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/native_connector_configuration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/native_connector_configuration.tsx
@@ -142,106 +142,111 @@ export const NativeConnectorConfiguration: React.FC = () => {
                 <EuiSpacer />
               </>
             )}
-            <EuiSteps
-              steps={[
-                {
-                  children: <ResearchConfiguration nativeConnector={nativeConnector} />,
-                  status: hasResearched ? 'complete' : 'incomplete',
-                  title: i18n.translate(
-                    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.researchConfigurationTitle',
+            {
+              <>
+                <EuiSpacer />
+                <AttachIndexBox connector={connector} />
+              </>
+            }
+            {connector.index_name && (
+              <>
+                <EuiSpacer />
+                <EuiSteps
+                  steps={[
                     {
-                      defaultMessage: 'Research configuration requirements',
-                    }
-                  ),
-                  titleSize: 'xs',
-                },
-                {
-                  children: (
-                    <NativeConnectorConfigurationConfig
-                      connector={connector}
-                      nativeConnector={nativeConnector}
-                      status={connector.status}
-                    />
-                  ),
-                  status: hasConfigured ? 'complete' : 'incomplete',
-                  title: i18n.translate(
-                    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.configurationTitle',
+                      children: <ResearchConfiguration nativeConnector={nativeConnector} />,
+                      status: hasResearched ? 'complete' : 'incomplete',
+                      title: i18n.translate(
+                        'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.researchConfigurationTitle',
+                        {
+                          defaultMessage: 'Research configuration requirements',
+                        }
+                      ),
+                      titleSize: 'xs',
+                    },
                     {
-                      defaultMessage: 'Configuration',
-                    }
-                  ),
-                  titleSize: 'xs',
-                },
-                {
-                  children: (
-                    <ApiKeyConfig
-                      indexName={connector.index_name || ''}
-                      hasApiKey={hasApiKey}
-                      isNative
-                    />
-                  ),
-                  status: hasApiKey ? 'complete' : 'incomplete',
-                  title: i18n.translate(
-                    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.manageApiKeyTitle',
+                      children: (
+                        <NativeConnectorConfigurationConfig
+                          connector={connector}
+                          nativeConnector={nativeConnector}
+                          status={connector.status}
+                        />
+                      ),
+                      status: hasConfigured ? 'complete' : 'incomplete',
+                      title: i18n.translate(
+                        'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.configurationTitle',
+                        {
+                          defaultMessage: 'Configuration',
+                        }
+                      ),
+                      titleSize: 'xs',
+                    },
                     {
-                      defaultMessage: 'Manage API key',
-                    }
-                  ),
-                  titleSize: 'xs',
-                },
-                {
-                  children: (
-                    <EuiFlexGroup direction="column">
-                      <EuiFlexItem>
-                        <EuiText size="s">
-                          <FormattedMessage
-                            id="xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnectorAdvancedConfiguration.description"
-                            defaultMessage="Finalize your connector by triggering a one time sync, or setting a recurring sync schedule."
-                          />
-                        </EuiText>
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <EuiFlexGroup responsive={false}>
-                          <EuiFlexItem grow={false}>
-                            <EuiButtonTo
-                              to={`${generateEncodedPath(CONNECTOR_DETAIL_TAB_PATH, {
-                                connectorId: connector.id,
-                                tabId: ConnectorDetailTabId.SCHEDULING,
-                              })}`}
-                            >
-                              {i18n.translate(
-                                'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnectorAdvancedConfiguration.schedulingButtonLabel',
-                                {
-                                  defaultMessage: 'Set schedule and sync',
-                                }
-                              )}
-                            </EuiButtonTo>
+                      children: (
+                        <ApiKeyConfig
+                          indexName={connector.index_name || ''}
+                          hasApiKey={hasApiKey}
+                          isNative
+                        />
+                      ),
+                      status: hasApiKey ? 'complete' : 'incomplete',
+                      title: i18n.translate(
+                        'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.manageApiKeyTitle',
+                        {
+                          defaultMessage: 'Manage API key',
+                        }
+                      ),
+                      titleSize: 'xs',
+                    },
+                    {
+                      children: (
+                        <EuiFlexGroup direction="column">
+                          <EuiFlexItem>
+                            <EuiText size="s">
+                              <FormattedMessage
+                                id="xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnectorAdvancedConfiguration.description"
+                                defaultMessage="Finalize your connector by triggering a one time sync, or setting a recurring sync schedule."
+                              />
+                            </EuiText>
                           </EuiFlexItem>
-                          <EuiFlexItem grow={false}>
-                            <SyncsContextMenu />
+                          <EuiFlexItem>
+                            <EuiFlexGroup responsive={false}>
+                              <EuiFlexItem grow={false}>
+                                <EuiButtonTo
+                                  to={`${generateEncodedPath(CONNECTOR_DETAIL_TAB_PATH, {
+                                    connectorId: connector.id,
+                                    tabId: ConnectorDetailTabId.SCHEDULING,
+                                  })}`}
+                                >
+                                  {i18n.translate(
+                                    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnectorAdvancedConfiguration.schedulingButtonLabel',
+                                    {
+                                      defaultMessage: 'Set schedule and sync',
+                                    }
+                                  )}
+                                </EuiButtonTo>
+                              </EuiFlexItem>
+                              <EuiFlexItem grow={false}>
+                                <SyncsContextMenu />
+                              </EuiFlexItem>
+                            </EuiFlexGroup>
                           </EuiFlexItem>
                         </EuiFlexGroup>
-                      </EuiFlexItem>
-                    </EuiFlexGroup>
-                  ),
-                  status: hasConfiguredAdvanced ? 'complete' : 'incomplete',
-                  title: i18n.translate(
-                    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.advancedConfigurationTitle',
-                    {
-                      defaultMessage: 'Sync your data',
-                    }
-                  ),
-                  titleSize: 'xs',
-                },
-              ]}
-            />
+                      ),
+                      status: hasConfiguredAdvanced ? 'complete' : 'incomplete',
+                      title: i18n.translate(
+                        'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.advancedConfigurationTitle',
+                        {
+                          defaultMessage: 'Sync your data',
+                        }
+                      ),
+                      titleSize: 'xs',
+                    },
+                  ]}
+                />
+              </>
+            )}
           </EuiPanel>
-          {
-            <>
-              <EuiSpacer />
-              <AttachIndexBox connector={connector} />
-            </>
-          }
         </EuiFlexItem>
         <EuiFlexItem grow={1}>
           <EuiFlexGroup direction="column">