diff --git a/packages/esm-patient-attachments-app/src/attachments/attachments-overview.component.tsx b/packages/esm-patient-attachments-app/src/attachments/attachments-overview.component.tsx
index c37cd80bc6..cbd2888acb 100644
--- a/packages/esm-patient-attachments-app/src/attachments/attachments-overview.component.tsx
+++ b/packages/esm-patient-attachments-app/src/attachments/attachments-overview.component.tsx
@@ -16,7 +16,7 @@ export interface Attachment {
   thumbnail: string;
   thumbnailWidth: number;
   thumbnailHeight: number;
-  caption: string;
+  thumbnailCaption: string;
   isSelected: boolean;
   dateTime?: string;
   bytesMimeType?: string;
diff --git a/packages/esm-patient-attachments-app/src/attachments/image-preview.component.tsx b/packages/esm-patient-attachments-app/src/attachments/image-preview.component.tsx
index 8abd637d18..2880523630 100644
--- a/packages/esm-patient-attachments-app/src/attachments/image-preview.component.tsx
+++ b/packages/esm-patient-attachments-app/src/attachments/image-preview.component.tsx
@@ -24,7 +24,7 @@ export default function FilePreview(props: FilePreviewProps) {
         setSaving(true);
       }
     },
-    [props.onSaveFile, saving],
+    [props.onSaveFile, saving, caption],
   );
 
   const cancelCapture = useCallback(
@@ -50,7 +50,8 @@ export default function FilePreview(props: FilePreviewProps) {
           <TextInput
             id="caption"
             autoFocus
-            labelText={null}
+            labelText={``}
+            autoComplete="off"
             readOnly={saving}
             placeholder={t('attachmentCaptionInstruction', 'Enter caption')}
             onChange={updateCaption}
diff --git a/packages/esm-patient-attachments-app/src/attachments/utils.ts b/packages/esm-patient-attachments-app/src/attachments/utils.ts
index 424b6361a3..8511392869 100644
--- a/packages/esm-patient-attachments-app/src/attachments/utils.ts
+++ b/packages/esm-patient-attachments-app/src/attachments/utils.ts
@@ -34,7 +34,8 @@ export function createGalleryEntry(data: any) {
     // thumbnailHeight: 212,
     thumbnailWidth: 170,
     thumbnailHeight: 130,
-    caption: data.comment,
+    thumbnailCaption: '',
+    tags: [{ value: formatDatetime(new Date(data.dateTime)), title: formatDatetime(new Date(data.dateTime)) }],
     isSelected: false,
     dateTime: formatDatetime(new Date(data.dateTime)),
     bytesMimeType: data.bytesMimeType,