diff --git a/airbyte-webapp-e2e-tests/cypress/integration/connectorBuilder.spec.ts b/airbyte-webapp-e2e-tests/cypress/integration/connectorBuilder.spec.ts
index 059e317cfbf89..5377bb69abe7e 100644
--- a/airbyte-webapp-e2e-tests/cypress/integration/connectorBuilder.spec.ts
+++ b/airbyte-webapp-e2e-tests/cypress/integration/connectorBuilder.spec.ts
@@ -1,8 +1,18 @@
 import { goToConnectorBuilderPage, testStream } from "pages/connectorBuilderPage";
-import { assertTestReadItems, assertTestReadAuthFailure, configureAuth, configureGlobals, configureStream, configurePagination, assertMultiPageReadItems } from "commands/connectorBuilder";
+import {
+  assertTestReadItems,
+  assertTestReadAuthFailure,
+  configureAuth,
+  configureGlobals,
+  configureStream,
+  configurePagination,
+  assertMultiPageReadItems,
+} from "commands/connectorBuilder";
+import { initialSetupCompleted } from "commands/workspaces";
 
 describe("Connector builder", () => {
   before(() => {
+    initialSetupCompleted();
     goToConnectorBuilderPage();
   });
 
diff --git a/airbyte-webapp/src/components/connectorBuilder/Builder/AddStreamButton.tsx b/airbyte-webapp/src/components/connectorBuilder/Builder/AddStreamButton.tsx
index 5c6d685997bfd..ab9f46e53d85c 100644
--- a/airbyte-webapp/src/components/connectorBuilder/Builder/AddStreamButton.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/Builder/AddStreamButton.tsx
@@ -9,7 +9,9 @@ import * as yup from "yup";
 import { Button } from "components/ui/Button";
 import { Modal, ModalBody, ModalFooter } from "components/ui/Modal";
 
+import { Action, Namespace } from "core/analytics";
 import { FormikPatch } from "core/form/FormikPatch";
+import { useAnalyticsService } from "hooks/services/Analytics";
 
 import { ReactComponent as PlusIcon } from "../../connection/ConnectionOnboarding/plusIcon.svg";
 import { BuilderStream, DEFAULT_BUILDER_STREAM_VALUES } from "../types";
@@ -34,6 +36,7 @@ export const AddStreamButton: React.FC<AddStreamButtonProps> = ({
   initialValues,
   "data-testid": testId,
 }) => {
+  const analyticsService = useAnalyticsService();
   const { formatMessage } = useIntl();
   const [isOpen, setIsOpen] = useState(false);
   const [streamsField, , helpers] = useField<BuilderStream[]>("streams");
@@ -57,17 +60,35 @@ export const AddStreamButton: React.FC<AddStreamButtonProps> = ({
         <Formik
           initialValues={{ streamName: "", urlPath: "" }}
           onSubmit={(values: AddStreamValues) => {
+            const id = uuid();
             helpers.setValue([
               ...streamsField.value,
               merge({}, DEFAULT_BUILDER_STREAM_VALUES, {
                 ...initialValues,
                 name: values.streamName,
                 urlPath: values.urlPath,
-                id: uuid(),
+                id,
               }),
             ]);
             setIsOpen(false);
             onAddStream(numStreams);
+            if (initialValues) {
+              analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.STREAM_COPY, {
+                actionDescription: "Existing stream copied into a new stream",
+                existing_stream_id: initialValues.id,
+                existing_stream_name: initialValues.name,
+                new_stream_id: id,
+                new_stream_name: values.streamName,
+                new_stream_url_path: values.urlPath,
+              });
+            } else {
+              analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.STREAM_CREATE, {
+                actionDescription: "New stream created from the Add Stream button",
+                stream_id: id,
+                stream_name: values.streamName,
+                url_path: values.urlPath,
+              });
+            }
           }}
           validationSchema={yup.object().shape({
             streamName: yup.string().required("form.empty.error"),
diff --git a/airbyte-webapp/src/components/connectorBuilder/Builder/AuthenticationSection.tsx b/airbyte-webapp/src/components/connectorBuilder/Builder/AuthenticationSection.tsx
index 5abfe0d0a85d6..a846658635bb2 100644
--- a/airbyte-webapp/src/components/connectorBuilder/Builder/AuthenticationSection.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/Builder/AuthenticationSection.tsx
@@ -1,3 +1,6 @@
+import { Action, Namespace } from "core/analytics";
+import { useAnalyticsService } from "hooks/services/Analytics";
+
 import { inferredAuthValues } from "../types";
 import { BuilderCard } from "./BuilderCard";
 import { BuilderField } from "./BuilderField";
@@ -7,12 +10,20 @@ import { BuilderOptional } from "./BuilderOptional";
 import { KeyValueListField } from "./KeyValueListField";
 
 export const AuthenticationSection: React.FC = () => {
+  const analyticsService = useAnalyticsService();
+
   return (
     <BuilderCard>
       <BuilderOneOf
         path="global.authenticator"
         label="Authentication"
         tooltip="Authentication method to use for requests sent to the API"
+        onSelect={(type) =>
+          analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.AUTHENTICATION_METHOD_SELECT, {
+            actionDescription: "Authentication method selected",
+            auth_type: type,
+          })
+        }
         options={[
           { label: "No Auth", typeValue: "NoAuth" },
           {
diff --git a/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderField.tsx b/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderField.tsx
index 497523e3a9b09..ae7bf7fa1909b 100644
--- a/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderField.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderField.tsx
@@ -30,7 +30,7 @@ interface BaseFieldProps {
   // path to the location in the Connector Manifest schema which should be set by this component
   path: string;
   label: string;
-  tooltip?: string;
+  tooltip?: React.ReactNode;
   readOnly?: boolean;
   optional?: boolean;
   pattern?: RegExp;
@@ -40,7 +40,7 @@ interface BaseFieldProps {
 
 export type BuilderFieldProps = BaseFieldProps &
   (
-    | { type: "string" | "number" | "integer"; onChange?: (newValue: string) => void }
+    | { type: "string" | "number" | "integer"; onChange?: (newValue: string) => void; onBlur?: (value: string) => void }
     | { type: "boolean"; onChange?: (newValue: boolean) => void }
     | { type: "array"; onChange?: (newValue: string[]) => void }
     | { type: "enum"; onChange?: (newValue: string) => void; options: string[] }
@@ -116,6 +116,9 @@ const InnerBuilderField: React.FC<BuilderFieldProps & FastFieldProps<unknown>> =
           error={hasError}
           readOnly={readOnly}
           adornment={adornment}
+          onBlur={(e) => {
+            props.onBlur?.(e.target.value);
+          }}
         />
       )}
       {props.type === "array" && (
diff --git a/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderOneOf.tsx b/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderOneOf.tsx
index d8046b0e4c974..9204cff3866ec 100644
--- a/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderOneOf.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderOneOf.tsx
@@ -23,6 +23,7 @@ interface BuilderOneOfProps {
   path: string; // path to the oneOf component in the json schema
   label: string;
   tooltip: string;
+  onSelect?: (type: string) => void;
 }
 
 const InnerBuilderOneOf: React.FC<BuilderOneOfProps & FastFieldProps<string>> = ({
@@ -32,6 +33,7 @@ const InnerBuilderOneOf: React.FC<BuilderOneOfProps & FastFieldProps<string>> =
   field: typePathField,
   path,
   form,
+  onSelect,
 }) => {
   const value = typePathField.value;
 
@@ -56,6 +58,8 @@ const InnerBuilderOneOf: React.FC<BuilderOneOfProps & FastFieldProps<string>> =
               type: selectedOption.value,
               ...selectedOption.default,
             });
+
+            onSelect?.(selectedOption.value);
           }}
         />
       }
diff --git a/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderSidebar.tsx b/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderSidebar.tsx
index 2ee753a208be6..b35661eedfef7 100644
--- a/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderSidebar.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/Builder/BuilderSidebar.tsx
@@ -10,6 +10,8 @@ import { Button } from "components/ui/Button";
 import { Heading } from "components/ui/Heading";
 import { Text } from "components/ui/Text";
 
+import { Action, Namespace } from "core/analytics";
+import { useAnalyticsService } from "hooks/services/Analytics";
 import { useConfirmationModalService } from "hooks/services/ConfirmationModal";
 import { BuilderView, useConnectorBuilderFormState } from "services/connectorBuilder/ConnectorBuilderStateService";
 
@@ -57,6 +59,7 @@ interface BuilderSidebarProps {
 }
 
 export const BuilderSidebar: React.FC<BuilderSidebarProps> = React.memo(({ className, toggleYamlEditor }) => {
+  const analyticsService = useAnalyticsService();
   const { formatMessage } = useIntl();
   const { hasErrors } = useBuilderErrors();
   const { openConfirmationModal, closeConfirmationModal } = useConfirmationModalService();
@@ -71,6 +74,9 @@ export const BuilderSidebar: React.FC<BuilderSidebarProps> = React.memo(({ class
         setValues(DEFAULT_BUILDER_FORM_VALUES);
         setSelectedView("global");
         closeConfirmationModal();
+        analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.RESET_ALL, {
+          actionDescription: "Connector Builder UI reset back to blank slate",
+        });
       },
     });
   };
@@ -100,7 +106,12 @@ export const BuilderSidebar: React.FC<BuilderSidebarProps> = React.memo(({ class
         className={styles.globalConfigButton}
         selected={selectedView === "global"}
         showErrorIndicator={hasErrors(true, ["global"])}
-        onClick={() => handleViewSelect("global")}
+        onClick={() => {
+          handleViewSelect("global");
+          analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.GLOBAL_CONFIGURATION_SELECT, {
+            actionDescription: "Global Configuration view selected",
+          });
+        }}
       >
         <FontAwesomeIcon icon={faSliders} />
         <FormattedMessage id="connectorBuilder.globalConfiguration" />
@@ -111,7 +122,12 @@ export const BuilderSidebar: React.FC<BuilderSidebarProps> = React.memo(({ class
         showErrorIndicator={false}
         className={styles.globalConfigButton}
         selected={selectedView === "inputs"}
-        onClick={() => handleViewSelect("inputs")}
+        onClick={() => {
+          handleViewSelect("inputs");
+          analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.USER_INPUTS_SELECT, {
+            actionDescription: "User Inputs view selected",
+          });
+        }}
       >
         <FontAwesomeIcon icon={faUser} />
         <FormattedMessage
@@ -131,13 +147,20 @@ export const BuilderSidebar: React.FC<BuilderSidebarProps> = React.memo(({ class
       </div>
 
       <div className={styles.streamList}>
-        {values.streams.map(({ name }, num) => (
+        {values.streams.map(({ name, id }, num) => (
           <ViewSelectButton
             key={num}
             data-testid={`navbutton-${String(num)}`}
             selected={selectedView === num}
             showErrorIndicator={hasErrors(true, [num])}
-            onClick={() => handleViewSelect(num)}
+            onClick={() => {
+              handleViewSelect(num);
+              analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.STREAM_SELECT, {
+                actionDescription: "Stream view selected",
+                stream_id: id,
+                stream_name: name,
+              });
+            }}
           >
             {name && name.trim() ? (
               <Text className={styles.streamViewText}>{name}</Text>
diff --git a/airbyte-webapp/src/components/connectorBuilder/Builder/GlobalConfigView.tsx b/airbyte-webapp/src/components/connectorBuilder/Builder/GlobalConfigView.tsx
index bc8e29a532a55..72a89aed91d9f 100644
--- a/airbyte-webapp/src/components/connectorBuilder/Builder/GlobalConfigView.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/Builder/GlobalConfigView.tsx
@@ -1,5 +1,10 @@
 import { useIntl } from "react-intl";
 
+import { TextWithHTML } from "components/ui/TextWithHTML";
+
+import { Action, Namespace } from "core/analytics";
+import { useAnalyticsService } from "hooks/services/Analytics";
+
 import { AuthenticationSection } from "./AuthenticationSection";
 import { BuilderCard } from "./BuilderCard";
 import { BuilderConfigView } from "./BuilderConfigView";
@@ -9,13 +14,29 @@ import styles from "./GlobalConfigView.module.scss";
 
 export const GlobalConfigView: React.FC = () => {
   const { formatMessage } = useIntl();
+  const analyticsService = useAnalyticsService();
 
   return (
     <BuilderConfigView heading={formatMessage({ id: "connectorBuilder.globalConfiguration" })}>
       {/* Not using intl for the labels and tooltips in this component in order to keep maintainence simple */}
       <BuilderTitle path="global.connectorName" label="Connector Name" size="lg" />
       <BuilderCard className={styles.content}>
-        <BuilderField type="string" path="global.urlBase" label="API URL" tooltip="Base URL of the source API" />
+        <BuilderField
+          type="string"
+          path="global.urlBase"
+          label="API URL"
+          tooltip={
+            <TextWithHTML text="Base URL of the source API.<br><br>Do not put sensitive information (e.g. API tokens) into this field - use the Authentication component for this." />
+          }
+          onBlur={(value: string) => {
+            if (value) {
+              analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.API_URL_CREATE, {
+                actionDescription: "Base API URL filled in",
+                api_url: value,
+              });
+            }
+          }}
+        />
       </BuilderCard>
       <AuthenticationSection />
     </BuilderConfigView>
diff --git a/airbyte-webapp/src/components/connectorBuilder/Builder/InputsForm.tsx b/airbyte-webapp/src/components/connectorBuilder/Builder/InputsForm.tsx
index 2ab7c5415aa77..af5173424d138 100644
--- a/airbyte-webapp/src/components/connectorBuilder/Builder/InputsForm.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/Builder/InputsForm.tsx
@@ -1,5 +1,4 @@
 import { Form, Formik, useField, useFormikContext } from "formik";
-import { JSONSchema7 } from "json-schema";
 import { useMemo } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useEffectOnce } from "react-use";
@@ -9,7 +8,10 @@ import { Button } from "components/ui/Button";
 import { Callout } from "components/ui/Callout";
 import { Modal, ModalBody, ModalFooter } from "components/ui/Modal";
 
+import { Action, Namespace } from "core/analytics";
 import { FormikPatch } from "core/form/FormikPatch";
+import { AirbyteJSONSchema } from "core/jsonSchema/types";
+import { useAnalyticsService } from "hooks/services/Analytics";
 
 import { BuilderFormInput, BuilderFormValues, getInferredInputs } from "../types";
 import { BuilderField } from "./BuilderField";
@@ -19,7 +21,7 @@ const supportedTypes = ["string", "integer", "number", "array", "boolean", "enum
 
 export interface InputInEditing {
   key: string;
-  definition: JSONSchema7;
+  definition: AirbyteJSONSchema;
   required: boolean;
   isNew?: boolean;
   showDefaultValueField: boolean;
@@ -68,6 +70,7 @@ export const InputForm = ({
   inputInEditing: InputInEditing;
   onClose: (newInput?: BuilderFormInput) => void;
 }) => {
+  const analyticsService = useAnalyticsService();
   const { values, setFieldValue } = useFormikContext<BuilderFormValues>();
   const [inputs, , helpers] = useField<BuilderFormInput[]>("inputs");
   const inferredInputs = useMemo(
@@ -112,6 +115,22 @@ export const InputForm = ({
           );
           onClose(newInput);
         }
+        analyticsService.track(
+          Namespace.CONNECTOR_BUILDER,
+          values.isNew ? Action.USER_INPUT_CREATE : Action.USER_INPUT_EDIT,
+          {
+            actionDescription: values.isNew ? "New user input created" : "Existing user input edited",
+            user_input_id: values.key,
+            user_input_name: values.definition.title,
+            hint: values.definition.description,
+            type: values.type,
+            allowed_enum_values: values.definition.enum,
+            secret_field: values.definition.airbyte_secret,
+            required_field: values.definition.required,
+            enable_default_value: values.showDefaultValueField,
+            default_value: values.definition.default,
+          }
+        );
       }}
     >
       <>
@@ -121,6 +140,11 @@ export const InputForm = ({
           onDelete={() => {
             helpers.setValue(inputs.value.filter((input) => input.key !== inputInEditing.key));
             onClose();
+            analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.USER_INPUT_DELETE, {
+              actionDescription: "User input deleted",
+              user_input_id: inputInEditing.key,
+              user_input_name: inputInEditing.definition.title,
+            });
           }}
           onClose={() => {
             onClose();
diff --git a/airbyte-webapp/src/components/connectorBuilder/Builder/StreamConfigView.tsx b/airbyte-webapp/src/components/connectorBuilder/Builder/StreamConfigView.tsx
index 9fa3cf43ff112..270c9b4c5acf3 100644
--- a/airbyte-webapp/src/components/connectorBuilder/Builder/StreamConfigView.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/Builder/StreamConfigView.tsx
@@ -10,7 +10,10 @@ import Indicator from "components/Indicator";
 import { Button } from "components/ui/Button";
 import { CodeEditor } from "components/ui/CodeEditor";
 import { Text } from "components/ui/Text";
+import { TextWithHTML } from "components/ui/TextWithHTML";
 
+import { Action, Namespace } from "core/analytics";
+import { useAnalyticsService } from "hooks/services/Analytics";
 import { useConfirmationModalService } from "hooks/services/ConfirmationModal";
 import {
   BuilderView,
@@ -64,7 +67,9 @@ export const StreamConfigView: React.FC<StreamConfigViewProps> = React.memo(({ s
               type="string"
               path={streamFieldPath("urlPath")}
               label="Path URL"
-              tooltip="Path of the endpoint that this stream represents."
+              tooltip={
+                <TextWithHTML text="Path of the API endpoint that this stream represents.<br><br>Do not put sensitive information (e.g. API tokens) into this field - use the Authentication component in the Global Configuration section for this." />
+              }
             />
             <BuilderField
               type="enum"
@@ -127,6 +132,7 @@ const StreamControls = ({
   setSelectedTab: (tab: "configuration" | "schema") => void;
   selectedTab: "configuration" | "schema";
 }) => {
+  const analyticsService = useAnalyticsService();
   const { formatMessage } = useIntl();
   const [field, , helpers] = useField<BuilderStream[]>("streams");
   const { openConfirmationModal, closeConfirmationModal } = useConfirmationModalService();
@@ -151,6 +157,11 @@ const StreamControls = ({
         helpers.setValue(updatedStreams);
         setSelectedView(viewToSelect);
         closeConfirmationModal();
+        analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.STREAM_DELETE, {
+          actionDescription: "New stream created from the Add Stream button",
+          stream_id: field.value[streamNum].id,
+          stream_name: field.value[streamNum].name,
+        });
       },
     });
   };
@@ -207,8 +218,9 @@ const StreamTab = ({
 );
 
 const SchemaEditor = ({ streamFieldPath }: { streamFieldPath: (fieldPath: string) => string }) => {
+  const analyticsService = useAnalyticsService();
   const [field, meta, helpers] = useField<string | undefined>(streamFieldPath("schema"));
-  const { streamRead } = useConnectorBuilderTestState();
+  const { streamRead, streams, testStreamIndex } = useConnectorBuilderTestState();
 
   const showImportButton = !field.value && streamRead.data?.inferred_schema;
 
@@ -219,7 +231,12 @@ const SchemaEditor = ({ streamFieldPath }: { streamFieldPath: (fieldPath: string
           full
           variant="secondary"
           onClick={() => {
-            helpers.setValue(formatJson(streamRead.data?.inferred_schema, true));
+            const formattedJson = formatJson(streamRead.data?.inferred_schema, true);
+            helpers.setValue(formattedJson);
+            analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.OVERWRITE_SCHEMA, {
+              actionDescription: "Declared schema overwritten by detected schema",
+              stream_name: streams[testStreamIndex]?.name,
+            });
           }}
         >
           <FormattedMessage id="connectorBuilder.useSchemaButton" />
diff --git a/airbyte-webapp/src/components/connectorBuilder/Builder/UiYamlToggleButton.tsx b/airbyte-webapp/src/components/connectorBuilder/Builder/UiYamlToggleButton.tsx
index e92f1cb251261..1ca0692d9dd56 100644
--- a/airbyte-webapp/src/components/connectorBuilder/Builder/UiYamlToggleButton.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/Builder/UiYamlToggleButton.tsx
@@ -3,6 +3,9 @@ import { FormattedMessage } from "react-intl";
 
 import { Text } from "components/ui/Text";
 
+import { Action, Namespace } from "core/analytics";
+import { useAnalyticsService } from "hooks/services/Analytics";
+
 import styles from "./UiYamlToggleButton.module.scss";
 
 interface UiYamlToggleButtonProps {
@@ -12,8 +15,20 @@ interface UiYamlToggleButtonProps {
 }
 
 export const UiYamlToggleButton: React.FC<UiYamlToggleButtonProps> = ({ className, yamlSelected, onClick }) => {
+  const analyticsService = useAnalyticsService();
+
   return (
-    <button className={classnames(styles.button, className)} onClick={onClick}>
+    <button
+      className={classnames(styles.button, className)}
+      onClick={() => {
+        onClick();
+        analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.TOGGLE_UI_YAML, {
+          actionDescription: "User clicked the UI | YAML toggle button",
+          current_view: yamlSelected ? "yaml" : "ui",
+          new_view: yamlSelected ? "ui" : "yaml",
+        });
+      }}
+    >
       <Text
         className={classnames(styles.text, {
           [styles.selected]: !yamlSelected,
diff --git a/airbyte-webapp/src/components/connectorBuilder/DownloadYamlButton.tsx b/airbyte-webapp/src/components/connectorBuilder/DownloadYamlButton.tsx
index ffe02b1fd34c3..39165de8e7370 100644
--- a/airbyte-webapp/src/components/connectorBuilder/DownloadYamlButton.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/DownloadYamlButton.tsx
@@ -1,10 +1,14 @@
 import { faDownload, faWarning } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useField } from "formik";
+import snakeCase from "lodash/snakeCase";
 import { FormattedMessage } from "react-intl";
 
 import { Button } from "components/ui/Button";
 import { Tooltip } from "components/ui/Tooltip";
 
+import { Action, Namespace } from "core/analytics";
+import { useAnalyticsService } from "hooks/services/Analytics";
 import { useConnectorBuilderFormState } from "services/connectorBuilder/ConnectorBuilderStateService";
 import { downloadFile } from "utils/file";
 
@@ -18,13 +22,21 @@ interface DownloadYamlButtonProps {
 }
 
 export const DownloadYamlButton: React.FC<DownloadYamlButtonProps> = ({ className, yaml, yamlIsValid }) => {
+  const analyticsService = useAnalyticsService();
   const { editorView } = useConnectorBuilderFormState();
   const { hasErrors, validateAndTouch } = useBuilderErrors();
+  const [connectorNameField] = useField<string>("global.connectorName");
 
   const downloadYaml = () => {
     const file = new Blob([yaml], { type: "text/plain;charset=utf-8" });
-    // TODO: pull name from connector name input or generate from yaml contents
-    downloadFile(file, "connector_builder.yaml");
+    downloadFile(
+      file,
+      connectorNameField.value ? `${snakeCase(connectorNameField.value)}.yaml` : "connector_builder.yaml"
+    );
+    analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.DOWNLOAD_YAML, {
+      actionDescription: "User clicked the Download Config button to download the YAML manifest",
+      editor_view: editorView,
+    });
   };
 
   const handleClick = () => {
diff --git a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/SchemaDiffView.tsx b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/SchemaDiffView.tsx
index cc4059d5e14ad..bace7f84fcf96 100644
--- a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/SchemaDiffView.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/SchemaDiffView.tsx
@@ -13,7 +13,9 @@ import { Callout } from "components/ui/Callout";
 import { FlexContainer, FlexItem } from "components/ui/Flex";
 import { Tooltip } from "components/ui/Tooltip";
 
+import { Action, Namespace } from "core/analytics";
 import { StreamReadInferredSchema } from "core/request/ConnectorBuilderClient";
+import { useAnalyticsService } from "hooks/services/Analytics";
 import {
   useConnectorBuilderFormState,
   useConnectorBuilderTestState,
@@ -62,7 +64,8 @@ function getDiff(existingSchema: string | undefined, detectedSchema: object): Di
 }
 
 export const SchemaDiffView: React.FC<SchemaDiffViewProps> = ({ inferredSchema }) => {
-  const { testStreamIndex } = useConnectorBuilderTestState();
+  const analyticsService = useAnalyticsService();
+  const { streams, testStreamIndex } = useConnectorBuilderTestState();
   const { editorView } = useConnectorBuilderFormState();
   const [field, , helpers] = useField(`streams[${testStreamIndex}].schema`);
   const formattedSchema = useMemo(() => inferredSchema && formatJson(inferredSchema, true), [inferredSchema]);
@@ -97,6 +100,10 @@ export const SchemaDiffView: React.FC<SchemaDiffViewProps> = ({ inferredSchema }
                     disabled={field.value === formattedSchema}
                     onClick={() => {
                       helpers.setValue(formattedSchema);
+                      analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.OVERWRITE_SCHEMA, {
+                        actionDescription: "Declared schema overwritten by detected schema",
+                        stream_name: streams[testStreamIndex]?.name,
+                      });
                     }}
                   >
                     <FormattedMessage
@@ -117,6 +124,10 @@ export const SchemaDiffView: React.FC<SchemaDiffViewProps> = ({ inferredSchema }
                           variant="dark"
                           onClick={() => {
                             helpers.setValue(schemaDiff.mergedSchema);
+                            analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.MERGE_SCHEMA, {
+                              actionDescription: "Detected and Declared schemas merged to update declared schema",
+                              stream_name: streams[testStreamIndex]?.name,
+                            });
                           }}
                         >
                           <FormattedMessage id="connectorBuilder.mergeSchemaButton" />
@@ -138,6 +149,10 @@ export const SchemaDiffView: React.FC<SchemaDiffViewProps> = ({ inferredSchema }
           variant="secondary"
           onClick={() => {
             helpers.setValue(formattedSchema);
+            analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.OVERWRITE_SCHEMA, {
+              actionDescription: "Declared schema overwritten by detected schema",
+              stream_name: streams[testStreamIndex]?.name,
+            });
           }}
         >
           <FormattedMessage id="connectorBuilder.useSchemaButton" />
diff --git a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamSelector.tsx b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamSelector.tsx
index 1983972295934..ddb18edcd4cee 100644
--- a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamSelector.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamSelector.tsx
@@ -5,6 +5,8 @@ import { useIntl } from "react-intl";
 import { Heading } from "components/ui/Heading";
 import { ListBox, ListBoxControlButtonProps } from "components/ui/ListBox";
 
+import { Action, Namespace } from "core/analytics";
+import { useAnalyticsService } from "hooks/services/Analytics";
 import {
   useConnectorBuilderTestState,
   useConnectorBuilderFormState,
@@ -29,6 +31,7 @@ const ControlButton: React.FC<ListBoxControlButtonProps<string>> = ({ selectedOp
 };
 
 export const StreamSelector: React.FC<StreamSelectorProps> = ({ className }) => {
+  const analyticsService = useAnalyticsService();
   const { formatMessage } = useIntl();
   const { selectedView, setSelectedView } = useConnectorBuilderFormState();
   const { streams, testStreamIndex, setTestStreamIndex } = useConnectorBuilderTestState();
@@ -45,6 +48,10 @@ export const StreamSelector: React.FC<StreamSelectorProps> = ({ className }) =>
 
       if (selectedView !== "global") {
         setSelectedView(selectedStreamIndex);
+        analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.STREAM_SELECT, {
+          actionDescription: "Stream view selected in testing panel",
+          stream_name: selectedStreamName,
+        });
       }
     }
   };
diff --git a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTester.tsx b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTester.tsx
index c9639fdb396a9..a2459150e457e 100644
--- a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTester.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTester.tsx
@@ -5,6 +5,8 @@ import { ResizablePanels } from "components/ui/ResizablePanels";
 import { Spinner } from "components/ui/Spinner";
 import { Text } from "components/ui/Text";
 
+import { Action, Namespace } from "core/analytics";
+import { useAnalyticsService } from "hooks/services/Analytics";
 import { useConnectorBuilderTestState } from "services/connectorBuilder/ConnectorBuilderStateService";
 
 import { LogsDisplay } from "./LogsDisplay";
@@ -20,9 +22,22 @@ export const StreamTester: React.FC<{
   const {
     streams,
     testStreamIndex,
-    streamRead: { data: streamReadData, refetch: readStream, isError, error, isFetching },
+    streamRead: {
+      data: streamReadData,
+      refetch: readStream,
+      isError,
+      error,
+      isFetching,
+      isFetchedAfterMount,
+      dataUpdatedAt,
+      errorUpdatedAt,
+    },
   } = useConnectorBuilderTestState();
 
+  const streamName = streams[testStreamIndex]?.name;
+
+  const analyticsService = useAnalyticsService();
+
   const [logsFlex, setLogsFlex] = useState(0);
   const handleLogsTitleClick = () => {
     // expand to 50% if it is currently minimized, otherwise minimize it
@@ -44,6 +59,25 @@ export const StreamTester: React.FC<{
     }
   }, [isError]);
 
+  useEffect(() => {
+    // This will only be true if the data was manually refetched by the user clicking the Test button,
+    // so the analytics events won't fire just from the user switching between streams, as desired
+    if (isFetchedAfterMount) {
+      if (errorMessage) {
+        analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.STREAM_TEST_FAILURE, {
+          actionDescription: "Stream test failed",
+          stream_name: streamName,
+          error_message: errorMessage,
+        });
+      } else {
+        analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.STREAM_TEST_SUCCESS, {
+          actionDescription: "Stream test succeeded",
+          stream_name: streamName,
+        });
+      }
+    }
+  }, [analyticsService, errorMessage, isFetchedAfterMount, streamName, dataUpdatedAt, errorUpdatedAt]);
+
   return (
     <div className={styles.container}>
       <Text className={styles.url} size="lg">
@@ -51,7 +85,13 @@ export const StreamTester: React.FC<{
       </Text>
 
       <StreamTestButton
-        readStream={readStream}
+        readStream={() => {
+          readStream();
+          analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.STREAM_TEST, {
+            actionDescription: "Stream test initiated",
+            stream_name: streamName,
+          });
+        }}
         hasTestInputJsonErrors={hasTestInputJsonErrors}
         setTestInputOpen={setTestInputOpen}
       />
diff --git a/airbyte-webapp/src/components/connectorBuilder/YamlEditor/YamlEditor.tsx b/airbyte-webapp/src/components/connectorBuilder/YamlEditor/YamlEditor.tsx
index 48aec965a78d5..1b212dd3ad454 100644
--- a/airbyte-webapp/src/components/connectorBuilder/YamlEditor/YamlEditor.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/YamlEditor/YamlEditor.tsx
@@ -8,7 +8,9 @@ import { useEffect, useMemo, useRef, useState } from "react";
 
 import { CodeEditor } from "components/ui/CodeEditor";
 
+import { Action, Namespace } from "core/analytics";
 import { ConnectorManifest } from "core/request/ConnectorManifest";
+import { useAnalyticsService } from "hooks/services/Analytics";
 import { useConfirmationModalService } from "hooks/services/ConfirmationModal";
 import {
   useConnectorBuilderFormState,
@@ -26,6 +28,7 @@ interface YamlEditorProps {
 }
 
 export const YamlEditor: React.FC<YamlEditorProps> = ({ toggleYamlEditor }) => {
+  const analyticsService = useAnalyticsService();
   const { setValues } = useFormikContext();
   const { openConfirmationModal, closeConfirmationModal } = useConfirmationModalService();
   const yamlEditorRef = useRef<editor.IStandaloneCodeEditor>();
@@ -102,8 +105,15 @@ export const YamlEditor: React.FC<YamlEditorProps> = ({ toggleYamlEditor }) => {
             setYamlIsValid(true);
             toggleYamlEditor();
             closeConfirmationModal();
+            analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.DISCARD_YAML_CHANGES, {
+              actionDescription: "YAML changes were discarded due to failure when converting from YAML to UI",
+            });
           },
         });
+        analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.YAML_TO_UI_CONVERSION_FAILURE, {
+          actionDescription: "Failure occured when converting from YAML to UI",
+          error_message: e.message,
+        });
       }
     } else {
       setYamlIsValid(true);
diff --git a/airbyte-webapp/src/core/analytics/types.ts b/airbyte-webapp/src/core/analytics/types.ts
index b55359d6c7696..c752a97e43bbd 100644
--- a/airbyte-webapp/src/core/analytics/types.ts
+++ b/airbyte-webapp/src/core/analytics/types.ts
@@ -6,6 +6,7 @@ export const enum Namespace {
   ONBOARDING = "Onboarding",
   USER = "User",
   CREDITS = "Credits",
+  CONNECTOR_BUILDER = "ConnectorBuilder",
 }
 
 export const enum Action {
@@ -28,6 +29,30 @@ export const enum Action {
   CHECKOUT_START = "CheckoutStart",
   LOAD_MORE_JOBS = "LoadMoreJobs",
   INVITE = "Invite",
+
+  // Connector Builder Actions
+  CONNECTOR_BUILDER_START = "ConnectorBuilderStart",
+  API_URL_CREATE = "ApiUrlCreated",
+  AUTHENTICATION_METHOD_SELECT = "AuthenticationMethodSelect",
+  GLOBAL_CONFIGURATION_SELECT = "GlobalConfigurationSelect",
+  USER_INPUTS_SELECT = "UserInputsSelect",
+  USER_INPUT_CREATE = "UserInputCreate",
+  USER_INPUT_EDIT = "UserInputEdit",
+  USER_INPUT_DELETE = "UserInputDelete",
+  STREAM_SELECT = "StreamSelect",
+  STREAM_CREATE = "StreamCreate",
+  STREAM_COPY = "StreamCopy",
+  STREAM_DELETE = "StreamDelete",
+  STREAM_TEST = "StreamTest",
+  STREAM_TEST_SUCCESS = "StreamTestSuccess",
+  STREAM_TEST_FAILURE = "StreamTestFailure",
+  RESET_ALL = "ResetAll",
+  DOWNLOAD_YAML = "DownloadYaml",
+  TOGGLE_UI_YAML = "ToggleUiYaml",
+  YAML_TO_UI_CONVERSION_FAILURE = "YamlToUiConversionFailure",
+  DISCARD_YAML_CHANGES = "DiscardYamlChanges",
+  OVERWRITE_SCHEMA = "OverwriteSchema",
+  MERGE_SCHEMA = "MergeSchema",
 }
 
 export type EventParams = Record<string, unknown>;
diff --git a/airbyte-webapp/src/pages/ConnectorBuilderPage/ConnectorBuilderPage.tsx b/airbyte-webapp/src/pages/ConnectorBuilderPage/ConnectorBuilderPage.tsx
index 11ced0aef7cb9..41e1931f0118f 100644
--- a/airbyte-webapp/src/pages/ConnectorBuilderPage/ConnectorBuilderPage.tsx
+++ b/airbyte-webapp/src/pages/ConnectorBuilderPage/ConnectorBuilderPage.tsx
@@ -1,6 +1,6 @@
 import classnames from "classnames";
 import { Formik } from "formik";
-import React, { useCallback, useMemo, useRef } from "react";
+import React, { useCallback, useEffect, useMemo, useRef } from "react";
 import { useIntl } from "react-intl";
 
 import { Builder } from "components/connectorBuilder/Builder/Builder";
@@ -9,6 +9,8 @@ import { builderFormValidationSchema, BuilderFormValues } from "components/conne
 import { YamlEditor } from "components/connectorBuilder/YamlEditor";
 import { ResizablePanels } from "components/ui/ResizablePanels";
 
+import { Action, Namespace } from "core/analytics";
+import { useAnalyticsService } from "hooks/services/Analytics";
 import {
   ConnectorBuilderTestStateProvider,
   ConnectorBuilderFormStateProvider,
@@ -22,6 +24,13 @@ const noop = function () {};
 
 const ConnectorBuilderPageInner: React.FC = React.memo(() => {
   const { builderFormValues, editorView, setEditorView } = useConnectorBuilderFormState();
+  const analyticsService = useAnalyticsService();
+
+  useEffect(() => {
+    analyticsService.track(Namespace.CONNECTOR_BUILDER, Action.CONNECTOR_BUILDER_START, {
+      actionDescription: "Connector Builder UI Opened",
+    });
+  }, [analyticsService]);
 
   const switchToUI = useCallback(() => setEditorView("ui"), [setEditorView]);
   const switchToYaml = useCallback(() => setEditorView("yaml"), [setEditorView]);
diff --git a/airbyte-webapp/src/pages/routes.tsx b/airbyte-webapp/src/pages/routes.tsx
index 6dbd338e4c5b2..5a25e2f69f723 100644
--- a/airbyte-webapp/src/pages/routes.tsx
+++ b/airbyte-webapp/src/pages/routes.tsx
@@ -85,12 +85,12 @@ export const AutoSelectFirstWorkspace: React.FC<{ includePath?: boolean }> = ({
   );
 };
 
-const RoutingWithWorkspace: React.FC = () => {
+const RoutingWithWorkspace: React.FC<{ element?: JSX.Element }> = ({ element }) => {
   const workspace = useCurrentWorkspace();
   useAddAnalyticsContextForWorkspace(workspace);
   useApiHealthPoll();
 
-  return workspace.initialSetupComplete ? <MainViewRoutes /> : <PreferencesRoutes />;
+  return workspace.initialSetupComplete ? element ?? <MainViewRoutes /> : <PreferencesRoutes />;
 };
 
 export const Routing: React.FC = () => {
@@ -110,7 +110,11 @@ export const Routing: React.FC = () => {
   );
   return (
     <Routes>
-      <Route path={`${RoutePaths.ConnectorBuilder}/*`} element={<ConnectorBuilderPage />} />
+      <Route
+        path={`${RoutePaths.Workspaces}/:workspaceId/${RoutePaths.ConnectorBuilder}`}
+        element={<RoutingWithWorkspace element={<ConnectorBuilderPage />} />}
+      />
+      <Route path={`${RoutePaths.ConnectorBuilder}/*`} element={<AutoSelectFirstWorkspace includePath />} />
       {OldRoutes}
       <Route path={RoutePaths.AuthFlow} element={<CompleteOauthRequest />} />
       <Route path={`${RoutePaths.Workspaces}/:workspaceId/*`} element={<RoutingWithWorkspace />} />