diff --git a/src/components/Insights/InsightJiraTicket/InsightJiraTicket.stories.tsx b/src/components/Insights/InsightJiraTicket/InsightJiraTicket.stories.tsx
index f5f8388cd..3ba20811a 100644
--- a/src/components/Insights/InsightJiraTicket/InsightJiraTicket.stories.tsx
+++ b/src/components/Insights/InsightJiraTicket/InsightJiraTicket.stories.tsx
@@ -69,7 +69,9 @@ export const Linked: Story = {
   args: {
     summary: "Summary text",
     description: { content: "Multiline\ndescription text", isLoading: false },
-    attachment: { url: "https://www.example.com", fileName: "attachment.ext" },
+    attachments: [
+      { url: "https://www.example.com", fileName: "attachment.ext" }
+    ],
     insight: { ...insight, ticketLink: "https://digma.ai/ticket/1" }
   }
 };
@@ -78,7 +80,32 @@ export const Unlinked: Story = {
   args: {
     summary: "",
     description: { content: "Multiline\ndescription text", isLoading: false },
-    attachment: { url: "https://www.example.com", fileName: "attachment.ext" },
-    insight
+    attachments: [
+      { url: "https://www.example.com", fileName: "attachment.ext" }
+    ],
+    insight: { ...insight, ticketLink: "https://digma.ai/ticket/1" }
+  }
+};
+
+export const SingleAttachment: Story = {
+  args: {
+    summary: "",
+    description: { content: "Description text", isLoading: false },
+    attachments: [
+      { url: "https://www.example.com", fileName: "attachment.ext" }
+    ],
+    insight: { ...insight, ticketLink: "https://digma.ai/ticket/1" }
+  }
+};
+
+export const MultiAttachments: Story = {
+  args: {
+    summary: "Summary text",
+    description: { content: "Description text", isLoading: false },
+    attachments: [
+      { url: "https://www.example.com", fileName: "attachment_1.ext" },
+      { url: "https://www.example.com", fileName: "attachment_2.ext" }
+    ],
+    insight: { ...insight, ticketLink: "https://digma.ai/ticket/1" }
   }
 };
diff --git a/src/components/Insights/InsightJiraTicket/index.tsx b/src/components/Insights/InsightJiraTicket/index.tsx
index b5611b306..3bf8a9753 100644
--- a/src/components/Insights/InsightJiraTicket/index.tsx
+++ b/src/components/Insights/InsightJiraTicket/index.tsx
@@ -11,6 +11,7 @@ import {
   InsightsGetDataListQuery,
   LinkTicketResponse
 } from "./types";
+import { Attachment } from "../../common/JiraTicket/types";
 
 export const InsightJiraTicket = (props: InsightJiraTicketProps) => {
   const [errorMessage, setErrorMessage] = useState<string | null>();
@@ -95,7 +96,7 @@ export const InsightJiraTicket = (props: InsightJiraTicketProps) => {
     <JiraTicket
       description={props.description}
       summary={props.summary}
-      attachment={props.attachment}
+      attachments={props.attachments || []}
       onClose={props.onClose}
       ticketLink={{ link: ticketLink, errorMessage }}
       unlinkTicket={unlinkTicket}
diff --git a/src/components/Insights/InsightJiraTicket/types.ts b/src/components/Insights/InsightJiraTicket/types.ts
index d8502c9b8..2be51245a 100644
--- a/src/components/Insights/InsightJiraTicket/types.ts
+++ b/src/components/Insights/InsightJiraTicket/types.ts
@@ -1,6 +1,7 @@
 import { ReactNode } from "react";
 import { InsightsQuery } from "../../common/App/types";
 import { GenericCodeObjectInsight } from "../types";
+import { Attachment } from "../../common/JiraTicket/types";
 
 export interface InsightJiraTicketProps {
   summary: string;
@@ -9,7 +10,7 @@ export interface InsightJiraTicketProps {
     isLoading?: boolean;
     errorMessage?: string;
   };
-  attachment?: { url: string; fileName: string };
+  attachments?: Attachment[];
   insight: GenericCodeObjectInsight;
   relatedInsight?: GenericCodeObjectInsight | null;
   onClose: () => void;
diff --git a/src/components/Insights/tickets/EndpointNPlusOneInsightTicket/index.tsx b/src/components/Insights/tickets/EndpointNPlusOneInsightTicket/index.tsx
index 83ecd9fdf..423963ebe 100644
--- a/src/components/Insights/tickets/EndpointNPlusOneInsightTicket/index.tsx
+++ b/src/components/Insights/tickets/EndpointNPlusOneInsightTicket/index.tsx
@@ -73,12 +73,16 @@ export const EndpointNPlusOneInsightTicket = (
   );
 
   const traceId = span?.traceId;
-  const attachment = traceId
-    ? {
-        url: `${config.jaegerURL}/api/traces/${traceId}?prettyPrint=true`,
-        fileName: `trace-${traceId}.json`
-      }
-    : undefined;
+  const attachments = [
+    ...(traceId
+      ? [
+          {
+            url: `${config.jaegerURL}/api/traces/${traceId}?prettyPrint=true`,
+            fileName: `trace-${traceId}.json`
+          }
+        ]
+      : [])
+  ];
 
   return (
     <InsightJiraTicket
@@ -89,7 +93,7 @@ export const EndpointNPlusOneInsightTicket = (
         errorMessage:
           spanInsight === null ? "Failed to get insight details" : undefined
       }}
-      attachment={attachment}
+      attachments={attachments}
       insight={props.data.insight}
       relatedInsight={spanInsight}
       onClose={props.onClose}
diff --git a/src/components/Insights/tickets/EndpointQueryOptimizationTicket/index.tsx b/src/components/Insights/tickets/EndpointQueryOptimizationTicket/index.tsx
index 126d6dc4c..d8d5ced45 100644
--- a/src/components/Insights/tickets/EndpointQueryOptimizationTicket/index.tsx
+++ b/src/components/Insights/tickets/EndpointQueryOptimizationTicket/index.tsx
@@ -101,12 +101,16 @@ export const EndpointQueryOptimizationInsightTicket = (
   );
 
   const traceId = span?.traceId;
-  const attachment = traceId
-    ? {
-        url: `${config.jaegerURL}/api/traces/${traceId}?prettyPrint=true`,
-        fileName: `trace-${traceId}.json`
-      }
-    : undefined;
+  const attachments = [
+    ...(traceId
+      ? [
+          {
+            url: `${config.jaegerURL}/api/traces/${traceId}?prettyPrint=true`,
+            fileName: `trace-${traceId}.json`
+          }
+        ]
+      : [])
+  ];
 
   return (
     <InsightJiraTicket
@@ -117,7 +121,7 @@ export const EndpointQueryOptimizationInsightTicket = (
         errorMessage:
           spanInsight === null ? "Failed to get insight details" : undefined
       }}
-      attachment={attachment}
+      attachments={attachments}
       insight={props.data.insight}
       relatedInsight={spanInsight}
       onClose={props.onClose}
diff --git a/src/components/Insights/tickets/NPlusOneInsightTicket/index.tsx b/src/components/Insights/tickets/NPlusOneInsightTicket/index.tsx
index f026c76c8..92ec56748 100644
--- a/src/components/Insights/tickets/NPlusOneInsightTicket/index.tsx
+++ b/src/components/Insights/tickets/NPlusOneInsightTicket/index.tsx
@@ -66,12 +66,16 @@ export const NPlusOneInsightTicket = (
   );
 
   const traceId = props.data.insight.traceId;
-  const attachment = traceId
-    ? {
-        url: `${config.jaegerURL}/api/traces/${traceId}?prettyPrint=true`,
-        fileName: `trace-${traceId}.json`
-      }
-    : undefined;
+  const attachments = [
+    ...(traceId
+      ? [
+          {
+            url: `${config.jaegerURL}/api/traces/${traceId}?prettyPrint=true`,
+            fileName: `trace-${traceId}.json`
+          }
+        ]
+      : [])
+  ];
 
   return (
     <InsightJiraTicket
@@ -80,7 +84,7 @@ export const NPlusOneInsightTicket = (
         content: renderDescription(),
         isLoading
       }}
-      attachment={attachment}
+      attachments={attachments}
       insight={props.data.insight}
       onClose={props.onClose}
     />
diff --git a/src/components/Insights/tickets/QueryOptimizationInsightTicket/index.tsx b/src/components/Insights/tickets/QueryOptimizationInsightTicket/index.tsx
index 68865d869..29d6bf373 100644
--- a/src/components/Insights/tickets/QueryOptimizationInsightTicket/index.tsx
+++ b/src/components/Insights/tickets/QueryOptimizationInsightTicket/index.tsx
@@ -80,12 +80,16 @@ export const QueryOptimizationInsightTicket = (
   );
 
   const traceId = props.data.insight.traceId;
-  const attachment = traceId
-    ? {
-        url: `${config.jaegerURL}/api/traces/${traceId}?prettyPrint=true`,
-        fileName: `trace-${traceId}.json`
-      }
-    : undefined;
+  const attachments = [
+    ...(traceId
+      ? [
+          {
+            url: `${config.jaegerURL}/api/traces/${traceId}?prettyPrint=true`,
+            fileName: `trace-${traceId}.json`
+          }
+        ]
+      : [])
+  ];
 
   return (
     <InsightJiraTicket
@@ -94,7 +98,7 @@ export const QueryOptimizationInsightTicket = (
         content: renderDescription(),
         isLoading
       }}
-      attachment={attachment}
+      attachments={attachments}
       insight={props.data.insight}
       onClose={props.onClose}
     />
diff --git a/src/components/Insights/tickets/ScalingIssueInsightTicket/index.tsx b/src/components/Insights/tickets/ScalingIssueInsightTicket/index.tsx
index 95de4010f..08c394cad 100644
--- a/src/components/Insights/tickets/ScalingIssueInsightTicket/index.tsx
+++ b/src/components/Insights/tickets/ScalingIssueInsightTicket/index.tsx
@@ -79,10 +79,11 @@ export const ScalingIssueInsightTicket = (
     ?.map((ep) => ep.sampleTraceId)
     ?.find((t) => t);
   const attachmentTrace = getTraceAttachment(config, traceId);
-
-  // Add it to the attachment(s) after we'll support more than one and
-  // know how to make https calls while ignoring ssl cert verification
   const attachmentHistogram = getHistogramAttachment(config, insight);
+  const attachments = [
+    ...(attachmentTrace ? [attachmentTrace] : []),
+    ...(attachmentHistogram ? [attachmentHistogram] : [])
+  ];
 
   return (
     <InsightJiraTicket
@@ -91,7 +92,7 @@ export const ScalingIssueInsightTicket = (
         content: renderDescription(),
         isLoading: isLoading
       }}
-      attachment={attachmentTrace}
+      attachments={attachments}
       insight={props.data.insight}
       onClose={props.onClose}
     />
diff --git a/src/components/Insights/tickets/ScalingIssueInsightTicketByRootCause/index.tsx b/src/components/Insights/tickets/ScalingIssueInsightTicketByRootCause/index.tsx
index b9e0a6ab5..88c01d094 100644
--- a/src/components/Insights/tickets/ScalingIssueInsightTicketByRootCause/index.tsx
+++ b/src/components/Insights/tickets/ScalingIssueInsightTicketByRootCause/index.tsx
@@ -84,10 +84,11 @@ export const ScalingIssueInsightTicketByRootCause = (
   const summary = getScalingIssueSummary(spanInsight);
 
   const attachmentTrace = getTraceAttachment(config, spanInfo?.sampleTraceId);
-
-  // Add it to the attachment(s) after we'll support more than one and
-  // know how to make https calls while ignoring ssl cert verification
   const attachmentHistogram = getHistogramAttachment(config, spanInsight);
+  const attachments = [
+    ...(attachmentTrace ? [attachmentTrace] : []),
+    ...(attachmentHistogram ? [attachmentHistogram] : [])
+  ];
 
   return (
     <InsightJiraTicket
@@ -98,7 +99,7 @@ export const ScalingIssueInsightTicketByRootCause = (
         errorMessage:
           spanInsight === null ? "Failed to get insight details" : undefined
       }}
-      attachment={attachmentTrace}
+      attachments={attachments}
       insight={props.data.insight}
       relatedInsight={spanInsight}
       onClose={props.onClose}
diff --git a/src/components/Tests/TestTicket/index.tsx b/src/components/Tests/TestTicket/index.tsx
index bc96156e1..e49c9c3cd 100644
--- a/src/components/Tests/TestTicket/index.tsx
+++ b/src/components/Tests/TestTicket/index.tsx
@@ -6,6 +6,7 @@ import { DigmaSignature } from "../../Insights/tickets/common/DigmaSignature";
 import { ConfigContext } from "../../common/App/ConfigContext";
 import { JiraTicket } from "../../common/JiraTicket";
 import { TestTicketProps } from "./types";
+import { Attachment } from "../../common/JiraTicket/types";
 
 export const TestTicket = (props: TestTicketProps) => {
   const {
@@ -51,12 +52,16 @@ export const TestTicket = (props: TestTicketProps) => {
     </>
   );
 
-  const attachment = traceId
-    ? {
-        url: `${config.jaegerURL}/api/traces/${traceId}?prettyPrint=true`,
-        fileName: `trace-${traceId}.json`
-      }
-    : undefined;
+  const attachments = [
+    ...(traceId
+      ? [
+          {
+            url: `${config.jaegerURL}/api/traces/${traceId}?prettyPrint=true`,
+            fileName: `trace-${traceId}.json`
+          }
+        ]
+      : [])
+  ];
 
   return (
     <JiraTicket
@@ -64,7 +69,7 @@ export const TestTicket = (props: TestTicketProps) => {
       description={{
         content: renderDescription()
       }}
-      attachment={attachment}
+      attachments={attachments}
       onClose={props.onClose}
       tracking={{ prefix: "tests" }}
     />
diff --git a/src/components/common/JiraTicket/AttachmentTag/index.tsx b/src/components/common/JiraTicket/AttachmentTag/index.tsx
index 6d55bd2ba..fdf6e1266 100644
--- a/src/components/common/JiraTicket/AttachmentTag/index.tsx
+++ b/src/components/common/JiraTicket/AttachmentTag/index.tsx
@@ -5,7 +5,7 @@ import { AttachmentTagProps } from "./types";
 export const AttachmentTag = (props: AttachmentTagProps) => (
   <s.Container>
     <s.IconContainer>
-      <props.icon color={"currentColor"} />
+      <props.icon color={"currentColor"} size={16} />
     </s.IconContainer>
     <Tooltip title={props.text}>
       <s.TextContainer>{props.text}</s.TextContainer>
diff --git a/src/components/common/JiraTicket/AttachmentTag/styles.ts b/src/components/common/JiraTicket/AttachmentTag/styles.ts
index 2e072b7bb..7b9f601fd 100644
--- a/src/components/common/JiraTicket/AttachmentTag/styles.ts
+++ b/src/components/common/JiraTicket/AttachmentTag/styles.ts
@@ -2,11 +2,8 @@ import styled from "styled-components";
 
 export const Container = styled.div`
   display: flex;
-  padding: 4px 6px 4px 4px;
+  padding: 2px 0;
   gap: 8px;
-  border-radius: 4px;
-  border: 1px solid ${({ theme }) => theme.colors.attachmentTag.border};
-  background: ${({ theme }) => theme.colors.attachmentTag.background};
   color: ${({ theme }) => theme.colors.attachmentTag.text};
   align-items: center;
   max-width: fit-content;
diff --git a/src/components/common/JiraTicket/Field/index.tsx b/src/components/common/JiraTicket/Field/index.tsx
index 891419311..fce3169db 100644
--- a/src/components/common/JiraTicket/Field/index.tsx
+++ b/src/components/common/JiraTicket/Field/index.tsx
@@ -1,7 +1,6 @@
 import { useCallback, useRef } from "react";
 import useDimensions from "react-cool-dimensions";
 import useScrollbarSize from "react-scrollbar-size";
-import { isString } from "../../../../typeGuards/isString";
 import * as s from "./styles";
 import { ButtonPosition, FieldProps } from "./types";
 
@@ -28,22 +27,16 @@ export const Field = (props: FieldProps) => {
     props.multiline === true ? "top" : "center";
 
   return (
-    <s.Container $selectable={props.selectable}>
-      <s.Label>{props.label}</s.Label>
-      <s.ContentContainer>
-        <s.Content ref={getContentRef} $multiline={props.multiline}>
-          {props.content}
-          <s.ButtonContainer
-            $position={iconPosition}
-            $scrollbarOffset={scrollbarOffset}
-          >
-            {props.button}
-          </s.ButtonContainer>
-        </s.Content>
-      </s.ContentContainer>
-      {isString(props.errorMessage) && (
-        <s.ErrorMessage>{props.errorMessage}</s.ErrorMessage>
-      )}
-    </s.Container>
+    <s.ContentContainer>
+      <s.Content ref={getContentRef} $multiline={props.multiline}>
+        {props.children}
+        <s.ButtonContainer
+          $position={iconPosition}
+          $scrollbarOffset={scrollbarOffset}
+        >
+          {props.button}
+        </s.ButtonContainer>
+      </s.Content>
+    </s.ContentContainer>
   );
 };
diff --git a/src/components/common/JiraTicket/Field/styles.ts b/src/components/common/JiraTicket/Field/styles.ts
index 32e16842a..737aa479c 100644
--- a/src/components/common/JiraTicket/Field/styles.ts
+++ b/src/components/common/JiraTicket/Field/styles.ts
@@ -1,17 +1,5 @@
 import styled from "styled-components";
-import { redScale } from "../../../common/App/v2colors";
-import { ButtonContainerProps, ContainerProps, ContentProps } from "./types";
-
-export const Container = styled.div<ContainerProps>`
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  ${({ $selectable }) => ($selectable ? "" : "user-select: none;")}
-`;
-
-export const Label = styled.label`
-  color: ${({ theme }) => theme.colors.jiraTicket.text.secondary};
-`;
+import { ButtonContainerProps, ContentProps } from "./types";
 
 export const ContentContainer = styled.div`
   display: flex;
@@ -48,19 +36,3 @@ export const ButtonContainer = styled.div<ButtonContainerProps>`
     }
   }}
 `;
-
-export const ErrorMessage = styled.span`
-  display: flex;
-  font-size: 13px;
-  align-items: center;
-  white-space: pre-line;
-  color: ${({ theme }) => {
-    switch (theme.mode) {
-      case "light":
-        return redScale[500];
-      case "dark":
-      case "dark-jetbrains":
-        return redScale[300];
-    }
-  }};
-`;
diff --git a/src/components/common/JiraTicket/Field/types.ts b/src/components/common/JiraTicket/Field/types.ts
index dd14d5a7a..a49dfa2fc 100644
--- a/src/components/common/JiraTicket/Field/types.ts
+++ b/src/components/common/JiraTicket/Field/types.ts
@@ -9,12 +9,9 @@ export interface FieldThemeColors {
 export type ButtonPosition = "top" | "center";
 
 export interface FieldProps {
-  content: ReactNode;
-  label: string;
+  children: ReactNode;
   button: ReactNode;
   multiline?: boolean;
-  errorMessage?: string;
-  selectable?: boolean;
 }
 
 export interface ButtonContainerProps {
@@ -25,7 +22,3 @@ export interface ButtonContainerProps {
 export interface ContentProps {
   $multiline?: boolean;
 }
-
-export interface ContainerProps {
-  $selectable?: boolean;
-}
diff --git a/src/components/common/JiraTicket/IconButton/index.tsx b/src/components/common/JiraTicket/IconButton/index.tsx
index 1124f2f23..09485a69a 100644
--- a/src/components/common/JiraTicket/IconButton/index.tsx
+++ b/src/components/common/JiraTicket/IconButton/index.tsx
@@ -5,7 +5,7 @@ import { IconButtonProps } from "./types";
 export const IconButton = (props: IconButtonProps) => (
   <Tooltip title={props.title}>
     <s.Button onClick={props.onClick} disabled={props.disabled}>
-      <props.icon color={"currentColor"} />
+      <props.icon color={"currentColor"} size={props.size} />
     </s.Button>
   </Tooltip>
 );
diff --git a/src/components/common/JiraTicket/IconButton/types.ts b/src/components/common/JiraTicket/IconButton/types.ts
index b3a6a8095..c48c8074c 100644
--- a/src/components/common/JiraTicket/IconButton/types.ts
+++ b/src/components/common/JiraTicket/IconButton/types.ts
@@ -6,4 +6,5 @@ export interface IconButtonProps {
   onClick: () => void;
   title: string;
   disabled?: boolean;
+  size?: number;
 }
diff --git a/src/components/common/JiraTicket/JiraTicket.stories.tsx b/src/components/common/JiraTicket/JiraTicket.stories.tsx
index b35dc8b9e..0746a57f4 100644
--- a/src/components/common/JiraTicket/JiraTicket.stories.tsx
+++ b/src/components/common/JiraTicket/JiraTicket.stories.tsx
@@ -19,6 +19,8 @@ export const Default: Story = {
   args: {
     summary: "Summary text",
     description: { content: "Multiline\ndescription text", isLoading: false },
-    attachment: { url: "https://www.example.com", fileName: "attachment.ext" }
+    attachments: [
+      { url: "https://www.example.com", fileName: "attachment.ext" }
+    ]
   }
 };
diff --git a/src/components/common/JiraTicket/Section/index.tsx b/src/components/common/JiraTicket/Section/index.tsx
new file mode 100644
index 000000000..765def69b
--- /dev/null
+++ b/src/components/common/JiraTicket/Section/index.tsx
@@ -0,0 +1,15 @@
+import { isString } from "../../../../typeGuards/isString";
+import * as s from "./styles";
+import { SectionProps } from "./types";
+
+export const Section = (props: SectionProps) => {
+  return (
+    <s.Container $selectable={props.selectable}>
+      <s.Label>{props.title}</s.Label>
+      {props.children}
+      {isString(props.errorMessage) && (
+        <s.ErrorMessage>{props.errorMessage}</s.ErrorMessage>
+      )}
+    </s.Container>
+  );
+};
diff --git a/src/components/common/JiraTicket/Section/styles.ts b/src/components/common/JiraTicket/Section/styles.ts
new file mode 100644
index 000000000..60aca3953
--- /dev/null
+++ b/src/components/common/JiraTicket/Section/styles.ts
@@ -0,0 +1,30 @@
+import styled from "styled-components";
+import { redScale } from "../../../common/App/v2colors";
+import { ContainerProps } from "./types";
+
+export const Container = styled.div<ContainerProps>`
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  ${({ $selectable }) => ($selectable ? "" : "user-select: none;")}
+`;
+
+export const Label = styled.label`
+  color: ${({ theme }) => theme.colors.jiraTicket.text.secondary};
+`;
+
+export const ErrorMessage = styled.span`
+  display: flex;
+  font-size: 13px;
+  align-items: center;
+  white-space: pre-line;
+  color: ${({ theme }) => {
+    switch (theme.mode) {
+      case "light":
+        return redScale[500];
+      case "dark":
+      case "dark-jetbrains":
+        return redScale[300];
+    }
+  }};
+`;
diff --git a/src/components/common/JiraTicket/Section/types.ts b/src/components/common/JiraTicket/Section/types.ts
new file mode 100644
index 000000000..180c40414
--- /dev/null
+++ b/src/components/common/JiraTicket/Section/types.ts
@@ -0,0 +1,12 @@
+import { ReactNode } from "react";
+
+export interface SectionProps {
+  children: ReactNode;
+  title: string;
+  errorMessage?: string;
+  selectable?: boolean;
+}
+
+export interface ContainerProps {
+  $selectable?: boolean;
+}
diff --git a/src/components/common/JiraTicket/index.tsx b/src/components/common/JiraTicket/index.tsx
index 370d15733..624c2030f 100644
--- a/src/components/common/JiraTicket/index.tsx
+++ b/src/components/common/JiraTicket/index.tsx
@@ -17,6 +17,7 @@ import { PaperclipIcon } from "../../common/icons/12px/PaperclipIcon";
 import { JiraLogoIcon } from "../../common/icons/16px/JiraLogoIcon";
 import { AttachmentTag } from "./AttachmentTag";
 import { Field } from "./Field";
+import { Section } from "./Section";
 import { IconButton } from "./IconButton";
 import { TicketLinkButton } from "./TicketLinkButton";
 import * as s from "./styles";
@@ -79,23 +80,25 @@ export const JiraTicket = (props: JiraTicketProps) => {
     }
   };
 
-  const handleDownloadButtonClick = () => {
+  const handleDownloadButtonClick = (attachment: {
+    url: string;
+    fileName: string;
+  }) => {
     sendTrackingEvent(
       prefixedTrackingEvents.JIRA_TICKET_ATTACHMENT_DOWNLOAD_BUTTON_CLICKED,
       { ...(props.tracking?.additionalInfo || {}) }
     );
 
-    if (props.attachment) {
-      downloadFile(props.attachment.url, props.attachment.fileName).catch(
-        (e) => {
-          const errorMessageString =
-            e instanceof Error ? `Error: ${e.message}` : "";
-          setDownloadErrorMessage(
-            `Failed to download file.\n${errorMessageString}`
-          );
-        }
-      );
-    }
+    downloadFile(attachment.url, attachment.fileName).catch(
+      // tmp
+      (e) => {
+        const errorMessageString =
+          e instanceof Error ? `Error: ${e.message}` : "";
+        setDownloadErrorMessage(
+          `Failed to download file.\n${errorMessageString}`
+        );
+      }
+    );
   };
 
   const errorMessage = props.description.isLoading
@@ -116,25 +119,38 @@ export const JiraTicket = (props: JiraTicketProps) => {
           </s.CloseButton>
         </Tooltip>
       </s.Header>
-      <Field
-        key={"summary"}
-        label={"Summary"}
-        content={props.summary}
-        button={
-          <IconButton
-            icon={CopyIcon}
-            title={"Copy"}
-            onClick={() => copyToClipboard("summary", props.summary)}
-          />
-        }
-        selectable={false}
-      />
-      <Field
+      <Section key={"summary"} title={"Summary"} selectable={false}>
+        <Field
+          button={
+            <IconButton
+              icon={CopyIcon}
+              title={"Copy"}
+              onClick={() => copyToClipboard("summary", props.summary)}
+            />
+          }
+        >
+          {props.summary}
+        </Field>
+      </Section>
+      <Section
         key={"description"}
-        label={"Description"}
-        multiline={true}
+        title={"Description"}
         selectable={false}
-        content={
+        errorMessage={errorMessage}
+      >
+        <Field
+          multiline={true}
+          button={
+            <IconButton
+              icon={CopyIcon}
+              title={"Copy"}
+              disabled={props.description.isLoading}
+              onClick={() =>
+                copyToClipboard("description", descriptionContentRef.current)
+              }
+            />
+          }
+        >
           <div ref={descriptionContentRef}>
             {props.description.isLoading ? (
               <s.LoaderContainer>
@@ -144,38 +160,35 @@ export const JiraTicket = (props: JiraTicketProps) => {
               props.description.content
             )}
           </div>
-        }
-        errorMessage={errorMessage}
-        button={
-          <IconButton
-            icon={CopyIcon}
-            title={"Copy"}
-            disabled={props.description.isLoading}
-            onClick={() =>
-              copyToClipboard("description", descriptionContentRef.current)
-            }
-          />
-        }
-      />
-      {props.attachment && (
-        <Field
+        </Field>
+      </Section>
+      {props.attachments.length > 0 && (
+        <Section
           key={"attachments"}
-          label={"Attachments"}
-          content={
-            <AttachmentTag
-              icon={PaperclipIcon}
-              text={props.attachment.fileName}
-            />
-          }
-          button={
-            <IconButton
-              icon={DownloadIcon}
-              title={"Download"}
-              onClick={handleDownloadButtonClick}
-            />
-          }
+          title={"Attachments"}
           errorMessage={downloadErrorMessage}
-        />
+        >
+          {props.attachments.map((attachment, i) => {
+            return (
+              <Field
+                key={"attachment-" + i.toString()}
+                button={
+                  <IconButton
+                    icon={DownloadIcon}
+                    title={"Download"}
+                    size={16}
+                    onClick={() => handleDownloadButtonClick(attachment)}
+                  />
+                }
+              >
+                <AttachmentTag
+                  icon={PaperclipIcon}
+                  text={attachment.fileName}
+                />
+              </Field>
+            );
+          })}
+        </Section>
       )}
       {props.showLinkButton && (
         <TicketLinkButton
diff --git a/src/components/common/JiraTicket/types.ts b/src/components/common/JiraTicket/types.ts
index 45bfe184a..6e32b3f23 100644
--- a/src/components/common/JiraTicket/types.ts
+++ b/src/components/common/JiraTicket/types.ts
@@ -17,7 +17,7 @@ export interface JiraTicketProps {
     isLoading?: boolean;
     errorMessage?: string;
   };
-  attachment?: { url: string; fileName: string };
+  attachments: Attachment[];
   onClose: () => void;
   tracking?: {
     prefix?: string;
@@ -32,3 +32,8 @@ export interface JiraTicketProps {
   unlinkTicket?: () => void;
   linkTicket?: (link: string) => void;
 }
+
+export interface Attachment {
+  url: string;
+  fileName: string;
+}