diff --git a/.github/ISSUE_TEMPLATE/2-issue-ai-assist.yaml b/.github/ISSUE_TEMPLATE/2-issue-ai-assist.yaml
new file mode 100644
index 00000000000..0e25c5664be
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-issue-ai-assist.yaml
@@ -0,0 +1,51 @@
+name: 🤖 [AI Assist] Report an issue using the AI Assist
+description: Use this template when you have a problem creating a connector using the AI Connector Assist.
+labels: [type/bug, area/connector-builder, needs-triage, ai-assist]
+body:
+  - type: markdown
+    attributes:
+      value: >
+        <p align="center">
+          <a target="_blank" href="https://airbyte.com">
+            <image>
+              <source srcset="https://raw.githubusercontent.com/airbytehq/airbyte/master/.github/octavia-issue-template.svg">
+              <img alt="octavia-welcome" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/.github/octavia-issue-template.svg" width="auto" height="120">
+            </image>
+          </a>
+        </p>
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report...
+        Make sure to update this issue with a concise title and provide all information you have to
+        help us debug the problem together.
+  - type: input
+    id: connector-url-link
+    attributes:
+      label: Connector Documentation URL
+      description: Share the documentation URL you used to create the connector.
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: What error are you seeing?
+      description: Please give any information you have and steps to reproduce the problem.
+  - type: textarea
+    id: replicate
+    attributes:
+      label: How to replicate
+      description: Please provide what steps you made so far
+  - type: textarea
+    id: expect
+    attributes:
+      label: What do you expect to happen?
+      description: What output were you expecting?
+  - type: checkboxes
+    id: alpha-release
+    attributes:
+      label: Is this in the Alpha Release?
+      description: Are you noticing this issue in the alpha release of AI Assist?
+      options:
+        - label: Yes, the issue is in the AI Assist Alpha Release.
+          required: false
diff --git a/.github/ISSUE_TEMPLATE/2-issue-docker.yaml b/.github/ISSUE_TEMPLATE/2-issue-docker.yaml
deleted file mode 100644
index 84b7662e660..00000000000
--- a/.github/ISSUE_TEMPLATE/2-issue-docker.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: 🐛 [docker] Report a platform, infra or deployment bug
-description: Use this template when you have a problem operating Airbyte platform on Docker
-labels: [type/bug, area/platform, needs-triage, docker]
-body:
-  - type: markdown
-    attributes:
-      value: >
-        <p align="center">
-          <a target="_blank" href="https://airbyte.com">
-            <image>
-              <source srcset="https://raw.githubusercontent.com/airbytehq/airbyte/master/.github/octavia-issue-template.svg">
-              <img alt="octavia-welcome" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/.github/octavia-issue-template.svg" width="auto" height="120">
-            </image>
-          </a>
-        </p>
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report...
-        Make sure to update this issue with a concise title and provide all information you have to 
-        help us debug the problem together. Issues not following the template will be closed.
-  - type: input
-    id: platform-version
-    attributes:
-      label: Platform Version
-      description: "Some examples are: (eg. 0.44.1, 0.30.0), you can find the version in the left bottom in Airbyte UI"
-    validations:
-      required: true
-  - type: dropdown
-    id: step
-    attributes:
-      label: What step the error happened?
-      multiple: false
-      options:
-        - On deploy
-        - During the Sync
-        - Upgrading the Platform or Helm Chart
-        - Other
-  - type: textarea
-    id: description
-    attributes:
-      label: Relevant information
-      description: Please give any additional information you have and steps to reproduce the problem.
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant log output
-      description: |
-        Please copy and paste any relevant log output. 
-        This will be automatically formatted into code, so no need for backticks.
-        We strongly recommend to upload the log file for further debugging.
-      render: shell