diff --git a/packages/console/src/pages/Connectors/Guide/Steps.tsx b/packages/console/src/pages/Connectors/Guide/Steps.tsx
new file mode 100644
index 00000000000..580493454e6
--- /dev/null
+++ b/packages/console/src/pages/Connectors/Guide/Steps.tsx
@@ -0,0 +1,46 @@
+import { type LocalePhrase } from '@logto/phrases';
+import React, { type ReactNode, type ReactElement } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import * as styles from './index.module.scss';
+
+type CanBeArray<T> = T | T[];
+
+type StepProps = {
+  readonly children: ReactNode;
+  readonly index?: number;
+  readonly tKey: keyof LocalePhrase['translation']['admin_console']['connectors']['guide'];
+};
+
+export function Step({ children, index, tKey }: StepProps) {
+  const { t } = useTranslation(undefined, { keyPrefix: 'admin_console.connectors.guide' });
+
+  return (
+    <div className={styles.block}>
+      <div className={styles.blockTitle}>
+        <div className={styles.number}>{index}</div>
+        <div>{t(tKey)}</div>
+      </div>
+      {children}
+    </div>
+  );
+}
+
+type Props = {
+  readonly children: CanBeArray<ReactElement<StepProps, typeof Step> | boolean>;
+};
+
+function Steps({ children }: Props) {
+  return (
+    <>
+      {React.Children.map(children, (child, index) => {
+        return (
+          typeof child !== 'boolean' &&
+          React.cloneElement(child, { key: child.key, index: index + 1 })
+        );
+      })}
+    </>
+  );
+}
+
+export default Steps;
diff --git a/packages/console/src/pages/Connectors/Guide/index.tsx b/packages/console/src/pages/Connectors/Guide/index.tsx
index 68ce4d20c41..0b03293b31b 100644
--- a/packages/console/src/pages/Connectors/Guide/index.tsx
+++ b/packages/console/src/pages/Connectors/Guide/index.tsx
@@ -33,6 +33,7 @@ import { trySubmitSafe } from '@/utils/form';
 
 import { splitMarkdownByTitle } from '../utils';
 
+import Steps, { Step } from './Steps';
 import * as styles from './index.module.scss';
 
 const targetErrorCode = 'connector.multiple_target_with_same_platform';
@@ -187,44 +188,34 @@ function Guide({ connector, onClose }: Props) {
           <div className={styles.setup}>
             <FormProvider {...methods}>
               <form autoComplete="off" onSubmit={onSubmit}>
-                {isSocialConnector && (
-                  <div className={styles.block}>
-                    <div className={styles.blockTitle}>
-                      <div className={styles.number}>1</div>
-                      <div>{t('connectors.guide.general_setting')}</div>
-                    </div>
-                    <BasicForm
-                      isAllowEditTarget={isStandard}
-                      isStandard={isStandard}
-                      conflictConnectorName={conflictConnectorName}
-                    />
-                  </div>
-                )}
-                <div className={styles.block}>
-                  <div className={styles.blockTitle}>
-                    <div className={styles.number}>{isSocialConnector ? 2 : 1}</div>
-                    <div>{t('connectors.guide.parameter_configuration')}</div>
-                  </div>
-                  <ConfigForm
-                    connectorId={callbackConnectorId.current}
-                    connectorFactoryId={connectorFactoryId}
-                    connectorType={connectorType}
-                    formItems={formItems}
-                  />
-                </div>
-                {!isSocialConnector && (
-                  <div className={styles.block}>
-                    <div className={styles.blockTitle}>
-                      <div className={styles.number}>2</div>
-                      <div>{t('connectors.guide.test_connection')}</div>
-                    </div>
-                    <ConnectorTester
-                      connectorFactoryId={connectorId}
+                <Steps>
+                  {isSocialConnector && (
+                    <Step tKey="general_setting">
+                      <BasicForm
+                        isAllowEditTarget={isStandard}
+                        isStandard={isStandard}
+                        conflictConnectorName={conflictConnectorName}
+                      />
+                    </Step>
+                  )}
+                  <Step tKey="parameter_configuration">
+                    <ConfigForm
+                      connectorId={callbackConnectorId.current}
+                      connectorFactoryId={connectorFactoryId}
                       connectorType={connectorType}
-                      parse={() => configParser(watch(), formItems)}
+                      formItems={formItems}
                     />
-                  </div>
-                )}
+                  </Step>
+                  {!isSocialConnector && (
+                    <Step tKey="test_connection">
+                      <ConnectorTester
+                        connectorFactoryId={connectorId}
+                        connectorType={connectorType}
+                        parse={() => configParser(watch(), formItems)}
+                      />
+                    </Step>
+                  )}
+                </Steps>
                 <div className={styles.footer}>
                   <Button
                     title="connectors.save_and_done"