diff --git a/.tx/config b/.tx/config
index d3ee9d90f0..cb49faa41c 100644
--- a/.tx/config
+++ b/.tx/config
@@ -37,15 +37,6 @@ replace_edited_strings = false
 keep_translations      = false
 resource_name          = esm-patient-allergies-app
 
-[o:openmrs:p:openmrs-esm-patient-chart:r:esm-patient-appointments-app]
-file_filter            = packages/esm-patient-appointments-app/translations/<lang>.json
-source_file            = packages/esm-patient-appointments-app/translations/en.json
-source_lang            = en
-type                   = KEYVALUEJSON
-replace_edited_strings = false
-keep_translations      = false
-resource_name          = esm-patient-appointments-app
-
 [o:openmrs:p:openmrs-esm-patient-chart:r:esm-patient-attachments-app]
 file_filter            = packages/esm-patient-attachments-app/translations/<lang>.json
 source_file            = packages/esm-patient-attachments-app/translations/en.json
diff --git a/README.md b/README.md
index ca8f1cbf6d..515679cdd4 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@
 The `openmrs-esm-patient-chart` is a frontend module for the OpenMRS SPA. It contains various microfrontends that constitute widgets in a patient dashboard. These widgets include:
 
 - [Allergies](packages/esm-patient-allergies-app/README.md)
-- [Appointments](packages/esm-patient-appointments-app/README.md)
 - [Attachments](packages/esm-patient-attachments-app/README.md)
 - [Biometrics](packages/esm-patient-biometrics-app/README.md)
 - [Conditions](packages/esm-patient-conditions-app/README.md)
diff --git a/__mocks__/appointments.mock.ts b/__mocks__/appointments.mock.ts
deleted file mode 100644
index 100c175c56..0000000000
--- a/__mocks__/appointments.mock.ts
+++ /dev/null
@@ -1,446 +0,0 @@
-export const mockAppointmentsData = {
-  data: [
-    {
-      uuid: '0d54aa56-0411-47f9-9ce9-23d702965881',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: null,
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1628598900000,
-      endDateTime: 1628599020000,
-      appointmentKind: 'WalkIn',
-      status: 'Scheduled',
-      comments: null,
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-    {
-      uuid: '0f445395-74a7-4d8b-a6ae-8f5195cc172e',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: null,
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1628598900000,
-      endDateTime: 1628599020000,
-      appointmentKind: 'WalkIn',
-      status: 'Scheduled',
-      comments: null,
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-    {
-      uuid: 'c5f4fdab-2d48-4412-adf4-ee26a6b0816f',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: null,
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1628599800000,
-      endDateTime: 1628600100000,
-      appointmentKind: 'Scheduled',
-      status: 'Scheduled',
-      comments: null,
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-    {
-      uuid: '7cd38a6d-377e-491b-8284-b04cf8b8c6d8',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: null,
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1630326900000,
-      endDateTime: 1630327200000,
-      appointmentKind: 'WalkIn',
-      status: 'Scheduled',
-      comments: 'Walk in appointments',
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-    {
-      uuid: 'e10ce4e3-0e91-4b97-bc6c-9b5068e58428',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: null,
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1631278200000,
-      endDateTime: 1631278560000,
-      appointmentKind: 'WalkIn',
-      status: 'Scheduled',
-      comments: 'Some additional notes',
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-    {
-      uuid: '8671c6bf-4305-48e4-8d25-bdf227d5f7af',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: null,
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1631367600000,
-      endDateTime: 1631368800000,
-      appointmentKind: 'WalkIn',
-      status: 'Scheduled',
-      comments: null,
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-    {
-      uuid: 'cdb0676f-0805-4c3e-bfef-7757a005e892',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: null,
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1631537400000,
-      endDateTime: 1631537760000,
-      appointmentKind: 'WalkIn',
-      status: 'Scheduled',
-      comments: 'Some additional notes',
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-    {
-      uuid: '66565d8b-4849-4b7c-966a-554d6073f80c',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: null,
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1631605800000,
-      endDateTime: 1631606100000,
-      appointmentKind: 'WalkIn',
-      status: 'Scheduled',
-      comments: 'Some additional notes',
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-    {
-      uuid: '45dcc19d-dd14-4a07-95c6-afa264972a34',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: { duration: 15, name: 'Chemotherapy', uuid: '53d58ff1-0c45-4e2e-9bd2-9cc826cb46e1' },
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1631623800000,
-      endDateTime: 1631624160000,
-      appointmentKind: 'WalkIn',
-      status: 'Scheduled',
-      comments: 'Some additional notes',
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-    {
-      uuid: 'fa4657ad-db46-487d-8e2e-a3858c906ae6',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: { duration: 15, name: 'Chemotherapy', uuid: '53d58ff1-0c45-4e2e-9bd2-9cc826cb46e1' },
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1631712720000,
-      endDateTime: 1631713080000,
-      appointmentKind: 'WalkIn',
-      status: 'Scheduled',
-      comments: 'Some value',
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-    {
-      uuid: '45dcc19d-dd14-4a07-95c6-afa264972a35',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: { duration: 15, name: 'Chemotherapy', uuid: '53d58ff1-0c45-4e2e-9bd2-9cc826cb46e1' },
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1631623800000,
-      endDateTime: 1631624160000,
-      appointmentKind: 'WalkIn',
-      status: 'Scheduled',
-      comments: 'Some additional notes',
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-    {
-      uuid: 'fa4657ad-db46-487d-8e2e-a3858c906ae7',
-      appointmentNumber: '0000',
-      patient: { identifier: '100GEJ', name: 'John Wilson', uuid: '8673ee4f-e2ab-4077-ba55-4980f408773e' },
-      service: {
-        appointmentServiceId: 1,
-        name: 'Outpatient',
-        description: null,
-        speciality: {},
-        startTime: '',
-        endTime: '',
-        maxAppointmentsLimit: null,
-        durationMins: null,
-        location: {},
-        uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-        color: '#006400',
-        initialAppointmentStatus: 'Scheduled',
-        creatorName: null,
-      },
-      serviceType: { duration: 15, name: 'Chemotherapy', uuid: '53d58ff1-0c45-4e2e-9bd2-9cc826cb46e1' },
-      provider: null,
-      location: { name: 'Isolation Ward', uuid: '2131aff8-2e2a-480a-b7ab-4ac53250262b' },
-      startDateTime: 1631712720000,
-      endDateTime: 1631713080000,
-      appointmentKind: 'WalkIn',
-      status: 'Scheduled',
-      comments: 'Some value',
-      additionalInfo: null,
-      providers: [],
-      recurring: false,
-    },
-  ],
-};
-
-export const mockUseAppointmentServiceData = [
-  {
-    appointmentServiceId: 1,
-    name: 'Outpatient',
-    description: null,
-    speciality: {},
-    startDateTime: new Date().toISOString(),
-    endTime: '',
-    maxAppointmentsLimit: null,
-    durationMins: 15,
-    location: {},
-    uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-    color: '#006400',
-    initialAppointmentStatus: 'Scheduled',
-    creatorName: null,
-    weeklyAvailability: [
-      {
-        dayOfWeek: 'MONDAY',
-        startTime: '07:00:00',
-        endTime: '20:00:00',
-        maxAppointmentsLimit: null,
-        uuid: '7c7c53c8-c104-40cc-9926-50fc6fe4c4c1',
-      },
-      {
-        dayOfWeek: 'TUESDAY',
-        startTime: '07:00:00',
-        endTime: '20:00:00',
-        maxAppointmentsLimit: null,
-        uuid: '7683b94e-6c48-4132-b402-54837a8c0fb2',
-      },
-      {
-        dayOfWeek: 'SUNDAY',
-        startTime: '07:00:00',
-        endTime: '20:00:00',
-        maxAppointmentsLimit: null,
-        uuid: '00be8427-0037-4984-8875-6a5a2bc57e8e',
-      },
-      {
-        dayOfWeek: 'FRIDAY',
-        startTime: '07:00:00',
-        endTime: '20:00:00',
-        maxAppointmentsLimit: null,
-        uuid: 'af6b8d5b-be05-4e24-8601-30573f848bec',
-      },
-      {
-        dayOfWeek: 'THURSDAY',
-        startTime: '07:00:00',
-        endTime: '20:00:00',
-        maxAppointmentsLimit: null,
-        uuid: 'eb35e91b-6909-41fe-9d09-750b83fb3b9c',
-      },
-      {
-        dayOfWeek: 'SATURDAY',
-        startTime: '07:00:00',
-        endTime: '20:00:00',
-        maxAppointmentsLimit: null,
-        uuid: '7f6347fd-c514-4fd2-ab79-d7fd760bf82f',
-      },
-      {
-        dayOfWeek: 'WEDNESDAY',
-        startTime: '07:00:00',
-        endTime: '20:00:00',
-        maxAppointmentsLimit: null,
-        uuid: 'dad83f54-a0a2-4ba9-819b-01e906c89b69',
-      },
-    ],
-    serviceTypes: [{ duration: 15, name: 'Chemotherapy', uuid: '53d58ff1-0c45-4e2e-9bd2-9cc826cb46e1' }],
-  },
-];
diff --git a/__mocks__/index.ts b/__mocks__/index.ts
index be3ecee574..e9c23caa57 100644
--- a/__mocks__/index.ts
+++ b/__mocks__/index.ts
@@ -1,5 +1,4 @@
 export * from './allergies.mock';
-export * from './appointments.mock';
 export * from './chart-widgets-config.mock';
 export * from './conditions.mock';
 export * from './encounters.mock';
diff --git a/e2e/pages/attachments-page.ts b/e2e/pages/attachments-page.ts
new file mode 100644
index 0000000000..8e40268c95
--- /dev/null
+++ b/e2e/pages/attachments-page.ts
@@ -0,0 +1,9 @@
+import { type Page } from '@playwright/test';
+
+export class AttachmentsPage {
+  constructor(readonly page: Page) {}
+
+  async goTo(uuid: string) {
+    await this.page.goto('/openmrs/spa/patient/' + uuid + '/chart/Attachments');
+  }
+}
diff --git a/e2e/pages/immunizations-page.ts b/e2e/pages/immunizations-page.ts
new file mode 100644
index 0000000000..850debaeb9
--- /dev/null
+++ b/e2e/pages/immunizations-page.ts
@@ -0,0 +1,10 @@
+import { type Page } from '@playwright/test';
+
+export class ImmunizationsPage {
+  constructor(readonly page: Page) {}
+  readonly immunizationsTable = () => this.page.getByRole('table', { name: /immunizations summary/i });
+
+  async goTo(patientUuid: string) {
+    await this.page.goto(`/openmrs/spa/patient/${patientUuid}/chart/Immunizations`);
+  }
+}
diff --git a/e2e/pages/index.ts b/e2e/pages/index.ts
index 45549ac2fa..77104f8ef5 100644
--- a/e2e/pages/index.ts
+++ b/e2e/pages/index.ts
@@ -1,7 +1,9 @@
 export * from './allergies-page';
+export * from './attachments-page';
 export * from './chart-page';
 export * from './conditions-page';
+export * from './immunizations-page';
 export * from './medications-page';
 export * from './program-page';
-export * from './vitals-and-biometrics-page';
 export * from './visits-page';
+export * from './vitals-and-biometrics-page';
diff --git a/e2e/specs/attachments.spec.ts b/e2e/specs/attachments.spec.ts
new file mode 100644
index 0000000000..90885aec8d
--- /dev/null
+++ b/e2e/specs/attachments.spec.ts
@@ -0,0 +1,91 @@
+import { expect } from '@playwright/test';
+import { generateRandomPatient, type Patient, deletePatient } from '../commands';
+import { test } from '../core';
+import { AttachmentsPage } from '../pages';
+
+let patient: Patient;
+
+test.beforeEach(async ({ api }) => {
+  patient = await generateRandomPatient(api);
+});
+
+test('Add and remove an attachment', async ({ page }) => {
+  const attachmentsPage = new AttachmentsPage(page);
+  const filePath = './e2e/support/upload/brainScan.jpeg';
+
+  await test.step('When I go to the Attachments page', async () => {
+    await attachmentsPage.goTo(patient.uuid);
+  });
+
+  await test.step('And I click on the `Record attachments` link', async () => {
+    await page.getByRole('button', { name: /record attachments/i }).click();
+  });
+
+  await test.step('Then I should see the `Add attachment` modal launch in the workspace', async () => {
+    await expect(page.getByText(/add attachment/i)).toBeVisible();
+  });
+
+  await test.step('When I click on the `Upload files` tab', async () => {
+    await page.getByRole('tab', { name: /upload files/i }).click();
+  });
+
+  await test.step('And I choose the attachment file to upload', async () => {
+    await page.on('filechooser', async (fileChooser) => {
+      await fileChooser.setFiles(filePath);
+    });
+    await page.click('.cds--file-browse-btn');
+  });
+
+  await test.step('And I add a description for the image to upload', async () => {
+    await page.getByLabel(/image description/i).clear();
+    await page.getByLabel(/image description/i).fill('This is a brain scan image of the patient');
+  });
+
+  await test.step('And I click on the `Add Attachment` button', async () => {
+    await page.getByRole('button', { name: /add Attachment/i }).click();
+  });
+
+  await test.step('Then I should see a success toast notification', async () => {
+    await expect(page.getByText(/upload complete/i)).toBeVisible();
+  });
+
+  await test.step('When I click on the `Close` button', async () => {
+    await page
+      .locator('button')
+      .filter({ hasText: /^Close$/ })
+      .click();
+  });
+
+  await test.step('Then I should see the file I uploaded displayed in the attachments table', async () => {
+    await expect(page.getByRole('button', { name: /brainScan.jpeg/i })).toBeVisible();
+  });
+
+  await test.step('When I click on the `Table view` tab', async () => {
+    await page.getByLabel(/table view/i).click();
+  });
+
+  await test.step('And I click the overflow menu in the table row of the uploaded file', async () => {
+    await page.getByRole('button', { name: /options/i }).click();
+  });
+
+  await test.step('And I click on the `Delete` button', async () => {
+    await page.getByRole('menuitem', { name: /delete/i }).click();
+    await page.getByRole('button', { name: /delete/i }).click();
+  });
+
+  await test.step('Then I should see a success toast notification', async () => {
+    await expect(page.getByText(/file deleted/i)).toBeVisible();
+  });
+
+  await test.step('And I should not see the deleted attachment in the list', async () => {
+    await expect(page.getByRole('button', { name: /brainScan.jpeg/i })).not.toBeVisible();
+  });
+
+  await test.step('And the attachments table should be empty', async () => {
+    await expect(page.getByText(/There are no attachments to display for this patient/i)).toBeVisible();
+  });
+});
+
+test.afterEach(async ({ api }) => {
+  await deletePatient(api, patient.uuid);
+});
diff --git a/e2e/specs/biometrics.spec.ts b/e2e/specs/biometrics.spec.ts
index a2c9640b10..903b8cf637 100644
--- a/e2e/specs/biometrics.spec.ts
+++ b/e2e/specs/biometrics.spec.ts
@@ -12,25 +12,38 @@ test.beforeEach(async ({ api }) => {
   visit = await startVisit(api, patient.uuid);
 });
 
-test('Record biometrics', async ({ page, api }) => {
+test('Record biometrics', async ({ page }) => {
   const biometricsPage = new BiometricsAndVitalsPage(page);
 
   await test.step('When I visit the vitals and biometrics page', async () => {
     await biometricsPage.goTo(patient.uuid);
   });
 
-  await test.step('And I click the `Record biometrics` link to launch the form', async () => {
+  await test.step('And I click on the `Record biometrics` link to launch the form', async () => {
     await biometricsPage.page.getByText(/record biometrics/i).click();
   });
 
-  await test.step('And then I fill the form', async () => {
+  await test.step('Then I should see the `Record Vitals and Biometrics` form launch in the workspace', async () => {
+    await expect(biometricsPage.page.getByText(/record vitals and biometrics/i)).toBeVisible();
+  });
+
+  await test.step('When I fill `170` as the height', async () => {
     await biometricsPage.page.getByRole('spinbutton', { name: /height/i }).fill('170');
+  });
+
+  await test.step('And I fill `65` as the weight', async () => {
     await biometricsPage.page.getByRole('spinbutton', { name: /weight/i }).fill('65');
+  });
+
+  await test.step('Then I should see `22.51` as the auto calculated body mass index', async () => {
     await expect(biometricsPage.page.getByRole('spinbutton', { name: /bmi/i })).toHaveValue('22.5');
+  });
+
+  await test.step('When I fill `25` as the mid upper arm circumference ', async () => {
     await biometricsPage.page.getByRole('spinbutton', { name: /muac/i }).fill('25');
   });
 
-  await test.step('And I click the submit button', async () => {
+  await test.step('And I click on the `Save and close` button', async () => {
     await biometricsPage.page.getByRole('button', { name: /save and close/i }).click();
   });
 
diff --git a/e2e/specs/clinical-forms.spec.ts b/e2e/specs/clinical-forms.spec.ts
index 0c3342d1d3..ad2c843165 100644
--- a/e2e/specs/clinical-forms.spec.ts
+++ b/e2e/specs/clinical-forms.spec.ts
@@ -43,19 +43,31 @@ test('Fill a clinical form', async ({ page, api }) => {
     await expect(chartPage.page.getByRole('cell', { name: /surgical operation/i })).toBeVisible();
   });
 
-  await test.step('And if I fill a form', async () => {
+  await test.step('When I click the `Soap note template` link to launch the form', async () => {
     await chartPage.page.getByText(/soap note template/i).click();
+  });
 
-    await expect(chartPage.page.getByRole('button', { name: /save and close/i })).toBeVisible();
-    await expect(chartPage.page.getByRole('button', { name: /discard/i })).toBeVisible();
+  await test.step('Then I should see the `Soap note template` form launch in the workspace', async () => {
+    await expect(chartPage.page.getByText(/soap note template/i)).toBeVisible();
+  });
 
+  await test.step('When I fill the `Subjective findings` question', async () => {
     await chartPage.page.locator('#SOAPSubjectiveFindingsid').fill(subjectiveFindings);
+  });
+
+  await test.step('And I fill the `Objective findings` question', async () => {
     await chartPage.page.locator('#SOAPObjectiveFindingsid').fill(objectiveFindings);
+  });
+
+  await test.step('And I fill the `Assessment` question', async () => {
     await chartPage.page.locator('#SOAPAssessmentid').fill(assessment);
+  });
+
+  await test.step('And I fill the `Plan` question', async () => {
     await chartPage.page.locator('#SOAPPlanid').fill(plan);
   });
 
-  await test.step('And I click the submit button', async () => {
+  await test.step('And I click on the `Save and close` button', async () => {
     await chartPage.page.getByRole('button', { name: /save and close/i }).click();
   });
 
diff --git a/e2e/specs/conditions.spec.ts b/e2e/specs/conditions.spec.ts
index 22f1fa3bb8..4fa38171c9 100644
--- a/e2e/specs/conditions.spec.ts
+++ b/e2e/specs/conditions.spec.ts
@@ -9,7 +9,7 @@ test.beforeEach(async ({ api }) => {
   patient = await generateRandomPatient(api);
 });
 
-test('Record, edit and delete a condition', async ({ page, api }) => {
+test('Record, edit and delete a condition', async ({ page }) => {
   const conditionsPage = new ConditionsPage(page);
   const headerRow = conditionsPage.conditionsTable().locator('thead > tr');
   const dataRow = conditionsPage.conditionsTable().locator('tbody > tr');
@@ -22,14 +22,28 @@ test('Record, edit and delete a condition', async ({ page, api }) => {
     await conditionsPage.page.getByText(/record conditions/i).click();
   });
 
-  await test.step('And I fill the form', async () => {
+  await test.step('Then I should see the conditions form launch in the workspace', async () => {
+    await expect(conditionsPage.page.getByText(/record a condition/i)).toBeVisible();
+  });
+
+  await test.step('When I search for `Mental status change` in the search box', async () => {
     await page.getByPlaceholder(/search conditions/i).fill('mental');
+  });
+
+  await test.step('And I select the condition', async () => {
     await page.getByRole('menuitem', { name: 'Mental status change' }).click();
+  });
+
+  await test.step('And I set `10/07/2023` as the onset date', async () => {
     await page.getByLabel(/onset date/i).fill('10/07/2023');
     await page.getByLabel(/onset date/i).press('Tab');
   });
 
-  await test.step('And I save the form', async () => {
+  await test.step('And I set the clinical status to `Active`', async () => {
+    await page.getByText('Active', { exact: true }).check();
+  });
+
+  await test.step('And I click on the `Save & close` button', async () => {
     await page.getByRole('button', { name: /save & close/i }).click();
   });
 
@@ -37,7 +51,7 @@ test('Record, edit and delete a condition', async ({ page, api }) => {
     await expect(conditionsPage.page.getByText(/condition saved/i)).toBeVisible();
   });
 
-  await test.step('And I should see the new condition added to the list', async () => {
+  await test.step('Then I should see the new condition added to the list', async () => {
     await expect(headerRow).toContainText(/condition/i);
     await expect(headerRow).toContainText(/date of onset/i);
     await expect(headerRow).toContainText(/status/i);
@@ -46,20 +60,32 @@ test('Record, edit and delete a condition', async ({ page, api }) => {
     await expect(dataRow).toContainText(/active/i);
   });
 
-  await test.step('Then if I click on the overflow menu and click the `Edit` button', async () => {
-    await expect(conditionsPage.page.getByRole('button', { name: /options/i })).toBeVisible();
-    await conditionsPage.page.getByRole('button', { name: /options/i }).click();
-    await expect(conditionsPage.page.getByRole('menu', { name: /edit or delete condition/i })).toBeVisible();
+  await test.step('When I click the overflow menu in the table row with the newly created condition', async () => {
+    await conditionsPage.page
+      .getByRole('button', { name: /options/i })
+      .nth(0)
+      .click();
+  });
+
+  await test.step('And I click on the `Edit` button', async () => {
     await conditionsPage.page.getByRole('menuitem', { name: /edit/i }).click();
   });
 
-  await test.step('And I edit the condition', async () => {
+  await test.step('Then I should see the Conditions form launch in the workspace in edit mode`', async () => {
+    await expect(page.getByRole('cell', { name: /mental status change/i })).toBeVisible();
+  });
+
+  await test.step('When I change the condition status to `Inactive`', async () => {
     await page.locator('label').filter({ hasText: 'Inactive' }).click();
-    await page.getByLabel(/end date/i).fill('11/07/2023');
-    await page.getByLabel(/end date/i).press('Tab');
   });
 
-  await test.step('And I save the form', async () => {
+  await test.step('And I change the on onset date to `11/07/2023`', async () => {
+    await page.getByLabel(/onset date/i).clear();
+    await page.getByLabel(/onset date/i).fill('11/07/2023');
+    await page.getByLabel(/onset date/i).press('Tab');
+  });
+
+  await test.step('And I click on the `Save & close` button', async () => {
     await page.getByRole('button', { name: /save & close/i }).click();
   });
 
@@ -76,16 +102,15 @@ test('Record, edit and delete a condition', async ({ page, api }) => {
     await expect(dataRow).toContainText(/inactive/i);
   });
 
-  await test.step('And if I click the overflow menu and then click the `Delete` button', async () => {
-    await expect(conditionsPage.page.getByRole('button', { name: /options/i })).toBeVisible();
-    await conditionsPage.page.getByRole('button', { name: /options/i }).click();
-    await expect(conditionsPage.page.getByRole('menu', { name: /edit or delete condition/i })).toBeVisible();
-    await conditionsPage.page.getByRole('menuitem', { name: /delete/i }).click();
-
-    await expect(conditionsPage.page.getByRole('heading', { name: /delete condition/i })).toBeVisible();
-    await expect(conditionsPage.page.getByText(/are you sure you want to delete this condition/i)).toBeVisible();
-    await expect(conditionsPage.page.getByRole('button', { name: /danger delete/i })).toBeVisible();
+  await test.step('When I click the overflow menu in the table row with the updated condition', async () => {
+    await conditionsPage.page
+      .getByRole('button', { name: /options/i })
+      .nth(0)
+      .click();
+  });
 
+  await test.step('And I click on the `Delete` button', async () => {
+    await conditionsPage.page.getByRole('menuitem', { name: /delete/i }).click();
     await page.getByRole('button', { name: /danger delete/i }).click();
   });
 
diff --git a/e2e/specs/drug-orders.spec.ts b/e2e/specs/drug-orders.spec.ts
index f7fd7c76c3..9d19ceb7dc 100644
--- a/e2e/specs/drug-orders.spec.ts
+++ b/e2e/specs/drug-orders.spec.ts
@@ -46,7 +46,7 @@ test('Record, edit and discontinue a drug order', async ({ page }) => {
       .click();
   });
 
-  await test.step('Then I should be redirected to the drug order form', async () => {
+  await test.step('Then I should see the drug order form launch in the workspace', async () => {
     await expect(page.getByText(/order form/i)).toBeVisible();
   });
 
@@ -84,7 +84,7 @@ test('Record, edit and discontinue a drug order', async ({ page }) => {
     await expect(page.getByText(/new/i)).toBeVisible();
   });
 
-  await test.step('When I click on the "Sign and close" button', async () => {
+  await test.step('When I click on the `Sign and close` button', async () => {
     await page.getByRole('button', { name: /sign and close/i }).click();
   });
 
@@ -106,7 +106,7 @@ test('Record, edit and discontinue a drug order', async ({ page }) => {
     await expect(dataRow).toContainText(/indication headache/i);
   });
 
-  await test.step('When I click the overflow menu of the created medication', async () => {
+  await test.step('When I click the overflow menu in the table row with the newly created medication', async () => {
     await page
       .getByRole('button', { name: /options/i })
       .nth(0)
@@ -117,7 +117,7 @@ test('Record, edit and discontinue a drug order', async ({ page }) => {
     await page.getByRole('menuitem', { name: /modify/i }).click();
   });
 
-  await test.step('Then I should be redirected to the order form of the created medication`', async () => {
+  await test.step('Then I should see the medication launch in the workspace in edit mode', async () => {
     await expect(page.getByText('Aspirin 81mg (81mg)')).toBeVisible();
   });
 
@@ -146,7 +146,7 @@ test('Record, edit and discontinue a drug order', async ({ page }) => {
     await page.getByLabel(/indication/i).fill('Hypertension');
   });
 
-  await test.step('And I click on the "Save Order" button', async () => {
+  await test.step('And I click on the `Save Order` button', async () => {
     await page.getByRole('button', { name: /save order/i }).click();
   });
 
@@ -155,7 +155,7 @@ test('Record, edit and discontinue a drug order', async ({ page }) => {
     await expect(page.getByText(/modify/i)).toBeVisible();
   });
 
-  await test.step('When I click on the "Sign and close" button', async () => {
+  await test.step('When I click on the `Sign and close` button', async () => {
     await page.getByRole('button', { name: /sign and close/i }).click();
   });
 
@@ -182,7 +182,7 @@ test('Record, edit and discontinue a drug order', async ({ page }) => {
     await expect(dataRow.nth(0)).toContainText(/indication hypertension/i);
   });
 
-  await test.step('When I click the overflow menu of the created medication', async () => {
+  await test.step('When I click the overflow menu in the table row with the updated medication', async () => {
     await page
       .getByRole('button', { name: /options/i })
       .nth(0)
@@ -197,7 +197,7 @@ test('Record, edit and discontinue a drug order', async ({ page }) => {
     await expect(page.getByText(/discontinue/i)).toBeVisible();
   });
 
-  await test.step('And I save the form', async () => {
+  await test.step('And I click on the `Sign and close` button', async () => {
     await page.getByRole('button', { name: /sign and close/i }).click();
   });
 
diff --git a/e2e/specs/immunizations.spec.ts b/e2e/specs/immunizations.spec.ts
new file mode 100644
index 0000000000..ae9fb53b1d
--- /dev/null
+++ b/e2e/specs/immunizations.spec.ts
@@ -0,0 +1,62 @@
+import { expect } from '@playwright/test';
+import { type Visit } from '@openmrs/esm-framework';
+import { generateRandomPatient, type Patient, startVisit, deletePatient } from '../commands';
+import { test } from '../core';
+import { ImmunizationsPage } from '../pages';
+
+let patient: Patient;
+let visit: Visit;
+
+test.beforeEach(async ({ api }) => {
+  patient = await generateRandomPatient(api);
+  visit = await startVisit(api, patient.uuid);
+});
+
+test('Add an immunization', async ({ page }) => {
+  const immunizationsPage = new ImmunizationsPage(page);
+  const headerRow = immunizationsPage.immunizationsTable().locator('thead > tr');
+  const immunizationType = immunizationsPage.immunizationsTable().locator('tbody td:nth-child(2)');
+  const vaccinationDate = immunizationsPage.immunizationsTable().locator('tbody td:nth-child(3)');
+
+  await test.step('When I go to the Immunizations page', async () => {
+    await immunizationsPage.goTo(patient.uuid);
+  });
+
+  await test.step('And I click on the `Record immunizations` link', async () => {
+    await page.getByRole('button', { name: /record immunizations/i }).click();
+  });
+
+  await test.step('Then I should see the Immunization form launch in the workspace', async () => {
+    await expect(page.getByText(/immunization form/i)).toBeVisible();
+  });
+
+  await test.step('When I set `08/03/2024` as the vaccination date', async () => {
+    await page.getByLabel(/vaccination date/i).clear();
+    await page.getByLabel(/vaccination date/i).fill('08/03/2024');
+    await page.getByLabel(/vaccination date/i).press('Tab');
+  });
+
+  await test.step('And I set `Hepatitis B vaccination` as the immunization', async () => {
+    await page.getByRole('combobox', { name: /immunization/i }).click();
+    await page.getByText(/hepatitis b vaccination/i).click();
+  });
+
+  await test.step('And I click on the `Save` button', async () => {
+    await page.getByRole('button', { name: /save/i }).click();
+  });
+
+  await test.step('Then I should see a success toast notification', async () => {
+    await expect(page.getByText(/vaccination saved successfully/i)).toBeVisible();
+  });
+
+  await test.step('And I should see the newly recorded immunization in the list', async () => {
+    await expect(headerRow).toContainText(/vaccine/i);
+    await expect(headerRow).toContainText(/recent vaccination/i);
+    await expect(immunizationType).toContainText(/hepatitis b vaccination/i);
+    await expect(vaccinationDate).toContainText(/mar 8, 2024/i);
+  });
+});
+
+test.afterEach(async ({ api }) => {
+  await deletePatient(api, patient.uuid);
+});
diff --git a/e2e/specs/lab-orders.spec.ts b/e2e/specs/lab-orders.spec.ts
index 7a888d7034..bc95b74332 100644
--- a/e2e/specs/lab-orders.spec.ts
+++ b/e2e/specs/lab-orders.spec.ts
@@ -68,7 +68,7 @@ test('Record, edit and discontinue a lab order', async ({ page }) => {
     ).toBeVisible();
   });
 
-  await test.step('When I launch the overflow menu of the created lab order', async () => {
+  await test.step('When I click the overflow menu in the table row with the newly created lab order', async () => {
     await page
       .getByRole('button', { name: /options/i })
       .nth(0)
@@ -99,7 +99,7 @@ test('Record, edit and discontinue a lab order', async ({ page }) => {
     ).toBeVisible();
   });
 
-  await test.step('When I launch the overflow menu of the created lab order', async () => {
+  await test.step('When I click the overflow menu in the table row with the updated lab order', async () => {
     await page
       .getByRole('button', { name: /options/i })
       .nth(0)
diff --git a/e2e/specs/program-enrollment.spec.ts b/e2e/specs/program-enrollment.spec.ts
index 47938ca227..66404a5efb 100644
--- a/e2e/specs/program-enrollment.spec.ts
+++ b/e2e/specs/program-enrollment.spec.ts
@@ -9,7 +9,7 @@ test.beforeEach(async ({ api }) => {
   patient = await generateRandomPatient(api);
 });
 
-test('Add and edit a program enrollment', async ({ page, api }) => {
+test('Add and edit a program enrollment', async ({ page }) => {
   const programsPage = new ProgramsPage(page);
   const headerRow = programsPage.programsTable().locator('thead > tr');
   const dataRow = programsPage.programsTable().locator('tbody > tr');
@@ -19,26 +19,39 @@ test('Add and edit a program enrollment', async ({ page, api }) => {
   });
 
   await test.step('And I click on the `Record program enrollment` link', async () => {
-    await programsPage.page.getByText(/record program enrollment/i).click();
+    await page.getByText(/record program enrollment/i).click();
   });
 
-  await test.step('And I record a program enrollment', async () => {
-    await programsPage.page.locator('#program').selectOption('64f950e6-1b07-4ac0-8e7e-f3e148f3463f');
-    await programsPage.page.locator('#enrollmentDateInput').fill('04/07/2023');
-    await programsPage.page.locator('#completionDateInput').fill('05/07/2023');
-    await programsPage.page.locator('#completionDateInput').press('Tab');
-    await programsPage.page.locator('#location').selectOption('44c3efb0-2583-4c80-a79e-1f756a03c0a1');
+  await test.step('Then I should see the `Record program enrollment` form launch in the workspace', async () => {
+    await expect(page.getByText('Record program enrollment', { exact: true })).toBeVisible();
   });
 
-  await test.step('And I click the submit button', async () => {
-    await programsPage.page.getByRole('button', { name: /save and close/i }).click();
+  await test.step('When I select the program named `Hiv Care and Treatment`', async () => {
+    await page.locator('#program').selectOption('64f950e6-1b07-4ac0-8e7e-f3e148f3463f');
   });
 
-  await test.step('And I should see a success toast notification', async () => {
-    await expect(programsPage.page.getByText(/program enrollment saved/i)).toBeVisible();
+  await test.step('And I set `04/07/2023` as the enrollment date', async () => {
+    await page.locator('#enrollmentDateInput').fill('04/07/2023');
   });
 
-  await test.step('Then I should see newly recorded program enrollment in the list', async () => {
+  await test.step('And I set `05/07/2023` as the completion date', async () => {
+    await page.locator('#completionDateInput').fill('05/07/2023');
+    await page.locator('#completionDateInput').press('Tab');
+  });
+
+  await test.step('And I select `Outpatient Clinic` as the enrollment location', async () => {
+    await page.locator('#location').selectOption('44c3efb0-2583-4c80-a79e-1f756a03c0a1');
+  });
+
+  await test.step('And I click on the `Save and close` button', async () => {
+    await page.getByRole('button', { name: /save and close/i }).click();
+  });
+
+  await test.step('Then I should see a success toast notification', async () => {
+    await expect(page.getByText(/program enrollment saved/i)).toBeVisible();
+  });
+
+  await test.step('And I should see newly recorded program enrollment in the list', async () => {
     await expect(headerRow).toContainText(/active programs/i);
     await expect(headerRow).toContainText(/location/i);
     await expect(headerRow).toContainText(/date enrolled/i);
@@ -49,31 +62,43 @@ test('Add and edit a program enrollment', async ({ page, api }) => {
     await expect(dataRow).toContainText(/outpatient clinic/i);
   });
 
-  await test.step('When I click the `Edit` button', async () => {
+  await test.step('When I click on the `Edit` button of the created program', async () => {
     await programsPage.editProgramButton().click();
   });
 
-  await test.step('And I edit the program enrollment', async () => {
-    await programsPage.page.locator('#enrollmentDateInput').clear();
-    await programsPage.page.locator('#enrollmentDateInput').fill('03/07/2023');
-    await programsPage.page.locator('#completionDateInput').clear();
-    await programsPage.page.locator('#completionDateInput').fill('04/07/2023');
-    await programsPage.page.locator('#completionDateInput').press('Tab');
-    await programsPage.page.locator('#location').selectOption('1ce1b7d4-c865-4178-82b0-5932e51503d6');
+  await test.step('Then I should see the program launch in the workspace in edit mode`', async () => {
+    await expect(page.getByRole('cell', { name: /hiv care and treatment/i })).toBeVisible();
+  });
+
+  await test.step('When I change the enrollment date to `03/07/2023`', async () => {
+    await page.locator('#enrollmentDateInput').clear();
+    await page.locator('#enrollmentDateInput').fill('03/07/2023');
+  });
+
+  await test.step('And I change the completion date to `04/07/2023`', async () => {
+    await page.locator('#completionDateInput').clear();
+    await page.locator('#completionDateInput').fill('04/07/2023');
+    await page.locator('#completionDateInput').press('Tab');
+  });
+
+  await test.step('And I change the enrollment location to `Community Outreach`', async () => {
+    await page.locator('#location').selectOption('1ce1b7d4-c865-4178-82b0-5932e51503d6');
   });
 
-  await test.step('And I click the submit button', async () => {
-    await programsPage.page.getByRole('button', { name: /save and close/i }).click();
+  await test.step('And I click on the `Save and close` button', async () => {
+    await page.getByRole('button', { name: /save and close/i }).click();
   });
 
-  await test.step('And I should see a success toast notification', async () => {
-    await expect(programsPage.page.getByText(/program enrollment updated/i)).toBeVisible();
+  await test.step('Then I should see a success toast notification', async () => {
+    await expect(page.getByText(/program enrollment updated/i)).toBeVisible();
   });
 
-  await test.step('Then I should see the updated program enrollment in the list', async () => {
+  await test.step('And I should see the updated program enrollment in the list', async () => {
     await expect(dataRow).toContainText(/hiv care and treatment/i);
     await expect(dataRow).toContainText(/03-Jul-2023/i);
+    await expect(dataRow).not.toContainText(/completed on 05-Jul-2023/i);
     await expect(dataRow).toContainText(/completed on 04-Jul-2023/i);
+    await expect(dataRow).not.toContainText(/outpatient clinic/i);
     await expect(dataRow).toContainText(/community outreach/i);
   });
 });
diff --git a/e2e/specs/record-allergy.spec.ts b/e2e/specs/record-allergy.spec.ts
index b10bd6cce4..4198fb64c3 100644
--- a/e2e/specs/record-allergy.spec.ts
+++ b/e2e/specs/record-allergy.spec.ts
@@ -9,7 +9,7 @@ test.beforeEach(async ({ api }) => {
   patient = await generateRandomPatient(api);
 });
 
-test('Record an allergy', async ({ page, api }) => {
+test('Record an allergy', async ({ page }) => {
   const allergiesPage = new PatientAllergiesPage(page);
   const headerRow = allergiesPage.allergiesTable().locator('thead > tr');
   const dataRow = allergiesPage.allergiesTable().locator('tbody > tr');
@@ -18,19 +18,32 @@ test('Record an allergy', async ({ page, api }) => {
     await allergiesPage.goTo(patient.uuid);
   });
 
-  await test.step('And I click the `Record allergy intolerance` link to launch the form', async () => {
+  await test.step('And I click on the `Record allergy intolerance` link to launch the form', async () => {
     await allergiesPage.page.getByText(/record allergy intolerance/i).click();
   });
 
-  await test.step('And I fill the form', async () => {
+  await test.step('Then I should see the record allergy form launch in the workspace', async () => {
+    await expect(page.getByText(/record a new allergy/i)).toBeVisible();
+  });
+
+  await test.step('When I select `ACE inhibitors` as the allergy', async () => {
     await allergiesPage.page.getByPlaceholder(/select the allergen/i).click();
     await allergiesPage.page.getByText(/ace inhibitors/i).click();
+  });
+
+  await test.step('And I select `Mental status change` as the reaction', async () => {
     await allergiesPage.page.getByText(/mental status change/i).click();
+  });
+
+  await test.step('And I select `Mild` as the severity', async () => {
     await allergiesPage.page.getByText(/mild/i).click();
+  });
+
+  await test.step('And I write `Test comment` as a comment', async () => {
     await allergiesPage.page.locator('#comments').fill('Test comment');
   });
 
-  await test.step('And I click the submit button', async () => {
+  await test.step('And I click on the `Save and close` button', async () => {
     await allergiesPage.page.getByRole('button', { name: /save and close/i }).click();
   });
 
@@ -44,7 +57,7 @@ test('Record an allergy', async ({ page, api }) => {
     await expect(headerRow).toContainText(/reaction/i);
     await expect(headerRow).toContainText(/onset date and comments/i);
     await expect(dataRow).toContainText(/ace inhibitors/i);
-    await expect(dataRow).toContainText(/MILD/i);
+    await expect(dataRow).toContainText(/mild/i);
     await expect(dataRow).toContainText(/mental status change/i);
     await expect(dataRow).toContainText(/test comment/i);
   });
diff --git a/e2e/specs/start-visit.spec.ts b/e2e/specs/visit.spec.ts
similarity index 86%
rename from e2e/specs/start-visit.spec.ts
rename to e2e/specs/visit.spec.ts
index ee09ef68af..fc1d715cbb 100644
--- a/e2e/specs/start-visit.spec.ts
+++ b/e2e/specs/visit.spec.ts
@@ -9,18 +9,18 @@ test.beforeEach(async ({ api }) => {
   patient = await generateRandomPatient(api);
 });
 
-test('Start a visit', async ({ page, api }) => {
+test('Start and end a visit', async ({ page }) => {
   const chartPage = new ChartPage(page);
 
   await test.step('When I visit the chart summary page', async () => {
     await chartPage.goTo(patient.uuid);
   });
 
-  await test.step('And I click the `Start a visit` button ', async () => {
+  await test.step('And I click on the `Start a visit` button ', async () => {
     await chartPage.page.getByRole('button', { name: /start a visit/i }).click();
   });
 
-  await test.step('Then I should see the `Start Visit` form in the workspace', async () => {
+  await test.step('Then I should see the `Start Visit` form launch in the workspace', async () => {
     await expect(chartPage.page.getByText(/visit start date and time/i)).toBeVisible();
     await expect(chartPage.page.getByPlaceholder(/dd\/mm\/yyyy/i)).toBeVisible();
     await expect(chartPage.page.getByPlaceholder(/hh\:mm/i)).toBeVisible();
@@ -40,7 +40,7 @@ test('Start a visit', async ({ page, api }) => {
     await chartPage.page.getByText(/opd visit/i).click();
   });
 
-  await test.step('And I click the `Start Visit` button', async () => {
+  await test.step('And I click on the `Start Visit` button', async () => {
     await chartPage.page
       .locator('form')
       .getByRole('button', { name: /start a visit/i })
@@ -55,7 +55,7 @@ test('Start a visit', async ({ page, api }) => {
     await expect(chartPage.page.getByLabel(/active visit/i)).toBeVisible();
   });
 
-  await test.step('When I click the `End Visit` button', async () => {
+  await test.step('When I click on the `End Visit` button', async () => {
     await chartPage.page.getByRole('button', { name: /end visit/i }).click();
   });
 
@@ -63,7 +63,7 @@ test('Start a visit', async ({ page, api }) => {
     await expect(chartPage.page.getByText(/are you sure you want to end this active visit?/i)).toBeVisible();
   });
 
-  await test.step('When I click the `End Visit` button to confirm', async () => {
+  await test.step('When I click on the `End Visit` button to confirm', async () => {
     await chartPage.page.getByRole('button', { name: 'danger End Visit' }).click();
   });
 
diff --git a/e2e/specs/vitals.spec.ts b/e2e/specs/vitals.spec.ts
index 36e85eaa8f..8a3b572db5 100644
--- a/e2e/specs/vitals.spec.ts
+++ b/e2e/specs/vitals.spec.ts
@@ -12,7 +12,7 @@ test.beforeEach(async ({ api }) => {
   visit = await startVisit(api, patient.uuid);
 });
 
-test('Record vital signs', async ({ page, api }) => {
+test('Record vital signs', async ({ page }) => {
   const vitalsPage = new BiometricsAndVitalsPage(page);
   const headerRow = vitalsPage.vitalsTable().locator('thead > tr');
   const dataRow = vitalsPage.vitalsTable().locator('tbody > tr');
@@ -21,21 +21,47 @@ test('Record vital signs', async ({ page, api }) => {
     await vitalsPage.goTo(patient.uuid);
   });
 
-  await test.step('And I click `Record biometrics` link to launch the form', async () => {
+  await test.step('And I click the `Record biometrics` link to launch the form', async () => {
     await vitalsPage.page.getByText(/record vital signs/i).click();
   });
 
-  await test.step('And then I fill the form', async () => {
+  await test.step('Then I should see the `Record Vitals and Biometrics` form launch in the workspace', async () => {
+    await expect(vitalsPage.page.getByText(/record vitals and biometrics/i)).toBeVisible();
+  });
+
+  await test.step('When I fill `37` as the temperature', async () => {
     await vitalsPage.page.getByRole('spinbutton', { name: /temperature/i }).fill('37');
+  });
+
+  await test.step('And I fill `120` as the systolic', async () => {
     await vitalsPage.page.getByRole('spinbutton', { name: /systolic/i }).fill('120');
+  });
+
+  await test.step('And I fill `100` as the diastolic', async () => {
     await vitalsPage.page.getByRole('spinbutton', { name: /diastolic/i }).fill('100');
+  });
+
+  await test.step('And I fill `37` as the pulse', async () => {
     await vitalsPage.page.getByRole('spinbutton', { name: /pulse/i }).fill('65');
+  });
+
+  await test.step('And I fill `37` as the respiration rate', async () => {
     await vitalsPage.page.getByRole('spinbutton', { name: /respiration rate/i }).fill('16');
+  });
+
+  await test.step('And I fill `37` as the oxygen saturation', async () => {
+    await vitalsPage.page.getByRole('spinbutton', { name: /oxygen saturation/i }).fill('98');
+  });
+
+  await test.step('And I add `37` as the oxygen saturation', async () => {
     await vitalsPage.page.getByRole('spinbutton', { name: /oxygen saturation/i }).fill('98');
+  });
+
+  await test.step('And I add additional notes', async () => {
     await vitalsPage.page.getByPlaceholder(/type any additional notes here/i).fill('Test notes');
   });
 
-  await test.step('And I click the submit button', async () => {
+  await test.step('And I click on the `Save and close` button', async () => {
     await vitalsPage.page.getByRole('button', { name: /save and close/i }).click();
   });
 
diff --git a/e2e/support/upload/brainScan.jpeg b/e2e/support/upload/brainScan.jpeg
new file mode 100644
index 0000000000..4a8175c02c
Binary files /dev/null and b/e2e/support/upload/brainScan.jpeg differ
diff --git a/packages/esm-form-entry-app/src/app/form-creation/form-creation.service.ts b/packages/esm-form-entry-app/src/app/form-creation/form-creation.service.ts
index 7a0ecd55bc..78f1e092fa 100644
--- a/packages/esm-form-entry-app/src/app/form-creation/form-creation.service.ts
+++ b/packages/esm-form-entry-app/src/app/form-creation/form-creation.service.ts
@@ -288,6 +288,11 @@ export class FormCreationService {
         const question = form.searchNodeByQuestionId(questionId);
         question[0]?.control?.setValue(value);
       });
+
+      if (encounterDate && preFilledQuestions.hasOwnProperty('encDate') && preFilledQuestions['encDate'] !== null) {
+        encounterDate[0].question.resetValueOnDisable = false;
+        encounterDate[0]?.control?.disable();
+      }
     }
   }
 
diff --git a/packages/esm-form-entry-app/src/single-spa-props.ts b/packages/esm-form-entry-app/src/single-spa-props.ts
index 12a6f52627..06ca40fa15 100644
--- a/packages/esm-form-entry-app/src/single-spa-props.ts
+++ b/packages/esm-form-entry-app/src/single-spa-props.ts
@@ -49,7 +49,6 @@ export type SingleSpaProps = AppProps &
   VisitProperties &
   EncounterProperties &
   PatientProperties &
-  UIBehavior &
   PreFilledQuestions &
   ApplicationStatus & {
     additionalProps?: any;
diff --git a/packages/esm-patient-appointments-app/README.md b/packages/esm-patient-appointments-app/README.md
deleted file mode 100644
index 5bc1f43118..0000000000
--- a/packages/esm-patient-appointments-app/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# esm-patient-appointments-app
-
-The appointments widget. It provides a tabular overview of the appointments recorded for a patient as well as a form for recording appointments.
-
diff --git a/packages/esm-patient-appointments-app/jest.config.js b/packages/esm-patient-appointments-app/jest.config.js
deleted file mode 100644
index 0352f6214c..0000000000
--- a/packages/esm-patient-appointments-app/jest.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const rootConfig = require('../../jest.config.js');
-
-module.exports = rootConfig;
diff --git a/packages/esm-patient-appointments-app/package.json b/packages/esm-patient-appointments-app/package.json
deleted file mode 100644
index 8349046cd3..0000000000
--- a/packages/esm-patient-appointments-app/package.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "name": "@openmrs/esm-patient-appointments-app",
-  "version": "7.1.0",
-  "license": "MPL-2.0",
-  "description": "Patient appointments microfrontend for the OpenMRS SPA",
-  "browser": "dist/openmrs-esm-patient-appointments-app.js",
-  "main": "src/index.ts",
-  "source": true,
-  "scripts": {
-    "start": "openmrs develop",
-    "serve": "webpack serve --mode=development",
-    "debug": "npm run serve",
-    "build": "webpack --mode production --color",
-    "analyze": "webpack --mode=production --env analyze=true",
-    "lint": "cross-env eslint src --ext tsx,ts --fix --max-warnings=0",
-    "test": "cross-env TZ=UTC jest --config jest.config.js --verbose false --passWithNoTests --color",
-    "test:watch": "cross-env TZ=UTC jest --watch --config jest.config.js --color",
-    "coverage": "yarn test --coverage",
-    "typescript": "tsc",
-    "extract-translations": "i18next 'src/**/*.component.tsx' 'src/index.ts' --config ../../tools/i18next-parser.config.js"
-  },
-  "browserslist": [
-    "extends browserslist-config-openmrs"
-  ],
-  "keywords": [
-    "openmrs"
-  ],
-  "homepage": "https://github.com/openmrs/openmrs-esm-patient-chart#readme",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/openmrs/openmrs-esm-patient-chart.git"
-  },
-  "bugs": {
-    "url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
-  },
-  "dependencies": {
-    "lodash-es": "^4.17.21"
-  },
-  "peerDependencies": {
-    "@openmrs/esm-framework": "5.x",
-    "@openmrs/esm-patient-common-lib": "7.x",
-    "dayjs": "1.x",
-    "react": "^18.2.0",
-    "react-i18next": "11.x",
-    "react-router-dom": "6.x",
-    "rxjs": "6.x",
-    "swr": "2.x"
-  },
-  "devDependencies": {
-    "@openmrs/esm-patient-common-lib": "workspace:*",
-    "webpack": "^5.88.2"
-  }
-}
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-action-menu.component.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-action-menu.component.tsx
deleted file mode 100644
index b3b839ae25..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-action-menu.component.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { Layer, OverflowMenu, OverflowMenuItem } from '@carbon/react';
-import { launchPatientWorkspace } from '@openmrs/esm-patient-common-lib';
-import { showModal, useLayoutType } from '@openmrs/esm-framework';
-import type { Appointment } from '../types';
-import styles from './appointments-action-menu.scss';
-
-interface appointmentsActionMenuProps {
-  appointment: Appointment;
-  patientUuid: string;
-}
-
-export const AppointmentsActionMenu = ({ appointment, patientUuid }: appointmentsActionMenuProps) => {
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-
-  const launchEditAppointmentForm = useCallback(
-    () =>
-      launchPatientWorkspace('appointments-form-workspace', {
-        workspaceTitle: t('editAppointment', 'Edit an appointment'),
-        appointment,
-        context: 'editing',
-      }),
-    [appointment, t],
-  );
-
-  const launchCancelAppointmentDialog = () => {
-    const dispose = showModal('appointment-cancel-confirmation-dialog', {
-      closeCancelModal: () => dispose(),
-      appointmentUuid: appointment.uuid,
-      patientUuid,
-    });
-  };
-
-  return (
-    <Layer className={styles.layer}>
-      <OverflowMenu aria-label="Edit or delete appointment" size={isTablet ? 'lg' : 'sm'} flipped align="left">
-        <OverflowMenuItem
-          className={styles.menuItem}
-          id="editAppointment"
-          onClick={launchEditAppointmentForm}
-          itemText={t('edit', 'Edit')}
-        />
-        <OverflowMenuItem
-          className={styles.menuItem}
-          id="cancelAppointment"
-          itemText={t('cancel', 'Cancel')}
-          onClick={launchCancelAppointmentDialog}
-          isDelete={true}
-          hasDivider
-        />
-      </OverflowMenu>
-    </Layer>
-  );
-};
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-action-menu.scss b/packages/esm-patient-appointments-app/src/appointments/appointments-action-menu.scss
deleted file mode 100644
index 2aac4db7c1..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-action-menu.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.layer {
-  height: 100%;
-}
-
-.menuItem {
-  max-width: none;
-}
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-base.component.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-base.component.tsx
deleted file mode 100644
index 5f8d62b138..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-base.component.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import dayjs from 'dayjs';
-import { Button, DataTableSkeleton, ContentSwitcher, InlineLoading, Layer, Switch, Tile } from '@carbon/react';
-import { Add } from '@carbon/react/icons';
-import { useLayoutType } from '@openmrs/esm-framework';
-import { CardHeader, EmptyDataIllustration, ErrorState, launchPatientWorkspace } from '@openmrs/esm-patient-common-lib';
-import { useAppointments } from './appointments.resource';
-import AppointmentsTable from './appointments-table.component';
-import styles from './appointments-base.scss';
-
-interface AppointmentsBaseProps {
-  basePath?: string;
-  patientUuid: string;
-}
-
-enum AppointmentTypes {
-  UPCOMING = 0,
-  TODAY = 1,
-  PAST = 2,
-}
-
-const AppointmentsBase: React.FC<AppointmentsBaseProps> = ({ patientUuid }) => {
-  const { t } = useTranslation();
-  const headerTitle = t('appointments', 'Appointments');
-  const isTablet = useLayoutType() === 'tablet';
-
-  const [switchedView, setSwitchedView] = useState(false);
-
-  const [contentSwitcherValue, setContentSwitcherValue] = useState(0);
-  const startDate = dayjs(new Date().toISOString()).subtract(6, 'month').toISOString();
-  const {
-    data: appointmentsData,
-    isError,
-    isLoading,
-    isValidating,
-  } = useAppointments(patientUuid, startDate, new AbortController());
-
-  const launchAppointmentsForm = () => launchPatientWorkspace('appointments-form-workspace');
-
-  if (isLoading) return <DataTableSkeleton role="progressbar" compact={!isTablet} zebra />;
-  if (isError) {
-    return <ErrorState headerTitle={headerTitle} error={isError} />;
-  }
-  if (Object.keys(appointmentsData)?.length) {
-    return (
-      <div className={styles.widgetCard}>
-        <CardHeader title={headerTitle}>
-          {isValidating ? (
-            <span>
-              <InlineLoading />
-            </span>
-          ) : null}
-          <div className={styles.contentSwitcherWrapper}>
-            <ContentSwitcher
-              size={isTablet ? 'md' : 'sm'}
-              onChange={({ index }) => {
-                setContentSwitcherValue(index);
-                setSwitchedView(true);
-              }}
-            >
-              <Switch name={'upcoming'} text={t('upcoming', 'Upcoming')} />
-              <Switch name={'today'} text={t('today', 'Today')} />
-              <Switch name={'past'} text={t('past', 'Past')} />
-            </ContentSwitcher>
-            <div className={styles.divider}>|</div>
-            <Button
-              kind="ghost"
-              renderIcon={(props) => <Add size={16} {...props} />}
-              iconDescription="Add Appointments"
-              onClick={launchAppointmentsForm}
-            >
-              {t('add', 'Add')}
-            </Button>
-          </div>
-        </CardHeader>
-        {(() => {
-          if (contentSwitcherValue === AppointmentTypes.UPCOMING) {
-            if (appointmentsData.upcomingAppointments?.length) {
-              return (
-                <AppointmentsTable
-                  patientAppointments={appointmentsData?.upcomingAppointments}
-                  switchedView={switchedView}
-                  setSwitchedView={setSwitchedView}
-                  patientUuid={patientUuid}
-                />
-              );
-            }
-            return (
-              <Layer>
-                <Tile className={styles.tile}>
-                  <EmptyDataIllustration />
-                  <p className={styles.content}>
-                    {t(
-                      'noUpcomingAppointmentsForPatient',
-                      'There are no upcoming appointments to display for this patient',
-                    )}
-                  </p>
-                </Tile>
-              </Layer>
-            );
-          }
-          if (contentSwitcherValue === AppointmentTypes.TODAY) {
-            if (appointmentsData.todaysAppointments?.length) {
-              return (
-                <AppointmentsTable
-                  patientAppointments={appointmentsData?.todaysAppointments}
-                  switchedView={switchedView}
-                  setSwitchedView={setSwitchedView}
-                  patientUuid={patientUuid}
-                />
-              );
-            }
-            return (
-              <Layer>
-                <Tile className={styles.tile}>
-                  <EmptyDataIllustration />
-                  <p className={styles.content}>
-                    {t(
-                      'noCurrentAppointments',
-                      'There are no appointments scheduled for today to display for this patient',
-                    )}
-                  </p>
-                </Tile>
-              </Layer>
-            );
-          }
-
-          if (contentSwitcherValue === AppointmentTypes.PAST) {
-            if (appointmentsData.pastAppointments?.length) {
-              return (
-                <AppointmentsTable
-                  patientAppointments={appointmentsData?.pastAppointments}
-                  switchedView={switchedView}
-                  setSwitchedView={setSwitchedView}
-                  patientUuid={patientUuid}
-                />
-              );
-            }
-            return (
-              <Layer>
-                <Tile className={styles.tile}>
-                  <EmptyDataIllustration />
-                  <p className={styles.content}>
-                    {t('noPastAppointments', 'There are no past appointments to display for this patient')}
-                  </p>
-                </Tile>
-              </Layer>
-            );
-          }
-        })()}
-      </div>
-    );
-  }
-};
-
-export default AppointmentsBase;
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-base.scss b/packages/esm-patient-appointments-app/src/appointments/appointments-base.scss
deleted file mode 100644
index 307c3a490c..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-base.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '@openmrs/esm-styleguide/src/vars';
-
-// TO DO Move this styles to style - guide
-// https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-styleguide/src/_vars.scss
-$color-blue-30 : #a6c8ff;
-$color-blue-10: #edf5ff;
-
-.widgetCard {
-  border: 1px solid $ui-03;
-}
-
-.productiveHeading01 {
-  @include type.type-style("heading-compact-01");
-}
-
-.contentSwitcherWrapper {
-  display: flex;
-  width: fit-content;
-  justify-content: flex-end;
-  align-items: center;
-  width: 60%;
-}
-
-.contentSwitcherWrapper > div > button {
-  background-color: $ui-02;
-}
-
-.contentSwitcherWrapper > div button:first-child {
-  border-top: 1px solid $color-blue-30;
-  border-bottom: 1px solid $color-blue-30;
-  border-left: 1px solid $color-blue-30;
-  border-right: none;
-  border-radius: spacing.$spacing-02 0 0px spacing.$spacing-02;
-}
-
-.contentSwitcherWrapper > div button:last-child {
-  border-top: 1px solid $color-blue-30;
-  border-bottom: 1px solid $color-blue-30;
-  border-right: 1px solid $color-blue-30;
-  border-left: none;
-  border-radius: 0px spacing.$spacing-02 spacing.$spacing-02 0px;
-}
-
-.contentSwitcherWrapper > div > button[aria-selected=true],
-.contentSwitcherWrapper > div > button[aria-selected=true]:first-child {
-  background-color: $color-blue-10;
-  color: $color-blue-60-2;
-  border-color: $color-blue-60-2;
-  border-right: 1px solid $color-blue-60-2;
-}
-
-.contentSwitcherWrapper > div > button[aria-selected=true],
-.contentSwitcherWrapper > div > button[aria-selected=true]:last-child {
-  background-color: $color-blue-10;
-  color: $color-blue-60-2;
-  border-color: $color-blue-60-2;
-  border-left: 1px solid $color-blue-60-2;
-}
-
-.contentSwitcherWrapper > div > button[aria-selected=true]:focus {
-  box-shadow: none;
-}
-
-.divider {
-  width: 1px;
-  height: spacing.$spacing-05;
-  color: colors.$gray-20;
-  margin: 0 spacing.$spacing-05;
-}
-
-.content {
-  @include type.type-style("heading-compact-01");
-  color: $text-02;
-  margin-top: spacing.$spacing-05;
-  margin-bottom: spacing.$spacing-03;
-}
-
-.tile {
-  text-align: center;
-}
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-base.test.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-base.test.tsx
deleted file mode 100644
index e8aff24abb..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-base.test.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import React from 'react';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { openmrsFetch, usePagination } from '@openmrs/esm-framework';
-import { mockAppointmentsData } from '__mocks__';
-import { mockPatient, patientChartBasePath, renderWithSwr, waitForLoadingToFinish } from 'tools';
-import AppointmentsBase from './appointments-base.component';
-
-const testProps = {
-  basePath: patientChartBasePath,
-  patientUuid: mockPatient.id,
-};
-
-const mockOpenmrsFetch = openmrsFetch as jest.Mock;
-const mockUsePagination = usePagination as jest.Mock;
-
-jest.mock('@openmrs/esm-framework', () => {
-  const originalModule = jest.requireActual('@openmrs/esm-framework');
-
-  return {
-    ...originalModule,
-    usePagination: jest.fn().mockImplementation(() => ({
-      currentPage: 1,
-      goTo: () => {},
-      results: [],
-    })),
-  };
-});
-
-describe('AppointmensOverview', () => {
-  it('renders an empty state if appointments data is unavailable', async () => {
-    mockOpenmrsFetch.mockReturnValueOnce({ data: [] });
-
-    renderAppointments();
-
-    await waitForLoadingToFinish();
-
-    expect(screen.getByRole('heading', { name: /appointments/i })).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: /add/i })).toBeInTheDocument();
-  });
-
-  it('renders an error state if there was a problem fetching appointments data', async () => {
-    const user = userEvent.setup();
-
-    const error = {
-      message: 'Internal server error',
-      response: {
-        status: 500,
-        statusText: 'Internal server error',
-      },
-    };
-
-    mockOpenmrsFetch.mockRejectedValueOnce(error);
-
-    renderAppointments();
-
-    await waitForLoadingToFinish();
-
-    expect(screen.getByRole('heading', { name: /appointments/i })).toBeInTheDocument();
-    expect(
-      screen.getByText(
-        'Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.',
-      ),
-    ).toBeInTheDocument();
-  });
-
-  it(`renders a tabular overview of the patient's appointment schedule if available`, async () => {
-    const user = userEvent.setup();
-
-    mockOpenmrsFetch.mockReturnValueOnce(mockAppointmentsData);
-    mockUsePagination.mockImplementation(() => ({
-      currentPage: 1,
-      goTo: () => {},
-      results: mockAppointmentsData.data,
-    }));
-
-    renderAppointments();
-
-    await waitForLoadingToFinish();
-
-    expect(screen.getByRole('heading', { name: /appointments/i })).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: /add/i })).toBeInTheDocument();
-
-    const upcomingAppointmentsTab = screen.getByRole('tab', { name: /upcoming/i });
-    const pastAppointmentsTab = screen.getByRole('tab', { name: /past/i });
-
-    expect(screen.getByRole('tablist')).toContainElement(upcomingAppointmentsTab);
-    expect(screen.getByRole('tablist')).toContainElement(pastAppointmentsTab);
-    expect(screen.getByTitle(/Empty data illustration/i)).toBeInTheDocument();
-    expect(screen.getByText(/There are no upcoming appointments to display for this patient/i)).toBeInTheDocument();
-
-    await user.click(pastAppointmentsTab);
-    expect(screen.getByRole('table')).toBeInTheDocument();
-
-    const expectedColumnHeaders = [/date/, /location/, /service/];
-    expectedColumnHeaders.forEach((header) => {
-      expect(screen.getByRole('columnheader', { name: new RegExp(header, 'i') })).toBeInTheDocument();
-    });
-
-    expect(screen.getAllByRole('row').length).toEqual(13);
-
-    const previousPageButton = screen.getByRole('button', { name: /previous page/i });
-    const nextPageButton = screen.getByRole('button', { name: /next page/i });
-
-    expect(previousPageButton).toBeDisabled();
-    expect(nextPageButton).not.toBeDisabled();
-  });
-});
-
-function renderAppointments() {
-  renderWithSwr(<AppointmentsBase {...testProps} />);
-}
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-cancel-modal.component.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-cancel-modal.component.tsx
deleted file mode 100644
index 6e99f04967..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-cancel-modal.component.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
-import { showSnackbar } from '@openmrs/esm-framework';
-import { cancelAppointment, useAppointments } from './appointments.resource';
-
-interface CancelAppointmentModalProps {
-  closeCancelModal: () => void;
-  appointmentUuid: string;
-  patientUuid: string;
-}
-
-const CancelAppointmentModal: React.FC<CancelAppointmentModalProps> = ({
-  closeCancelModal,
-  appointmentUuid,
-  patientUuid,
-}) => {
-  const { t } = useTranslation();
-  const { mutate } = useAppointments(patientUuid, new Date().toUTCString(), new AbortController());
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const handleCancel = async () => {
-    setIsSubmitting(true);
-
-    cancelAppointment('Cancelled', appointmentUuid)
-      .then(({ status }) => {
-        if (status === 200) {
-          mutate();
-          closeCancelModal();
-          showSnackbar({
-            isLowContrast: true,
-            kind: 'success',
-            subtitle: t('appointmentCancelledSuccessfully', 'Appointment cancelled successfully'),
-            title: t('appointmentCancelled', 'Appointment cancelled'),
-          });
-        }
-      })
-      .catch((err) => {
-        showSnackbar({
-          title: t('appointmentCancelError', 'Error cancelling appointment'),
-          kind: 'error',
-          isLowContrast: true,
-          subtitle: err?.message,
-        });
-      });
-  };
-
-  return (
-    <div>
-      <ModalHeader closeModal={closeCancelModal} title={t('cancelAppointment', 'Cancel appointment')} />
-      <ModalBody>
-        <p>{t('cancelAppointmentModalConfirmationText', 'Are you sure you want to cancel this appointment?')}</p>
-      </ModalBody>
-      <ModalFooter>
-        <Button kind="secondary" onClick={closeCancelModal}>
-          {t('discard', 'Discard')}
-        </Button>
-        <Button kind="danger" onClick={handleCancel} disabled={isSubmitting}>
-          {t('cancelAppointment', 'Cancel appointment')}
-        </Button>
-      </ModalFooter>
-    </div>
-  );
-};
-
-export default CancelAppointmentModal;
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-detailed-summary.component.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-detailed-summary.component.tsx
deleted file mode 100644
index 6734b61f7a..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-detailed-summary.component.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import AppointmentBase from './appointments-base.component';
-
-interface AppointmentsDetailedSummaryProps {
-  patientUuid: string;
-}
-
-const AppointmentsDetailedSummary: React.FC<AppointmentsDetailedSummaryProps> = ({ patientUuid }) => {
-  return <AppointmentBase patientUuid={patientUuid} />;
-};
-
-export default AppointmentsDetailedSummary;
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-overview.component.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-overview.component.tsx
deleted file mode 100644
index 30f7ed768e..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-overview.component.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import AppointmentsBase from './appointments-base.component';
-
-interface AppointmentOverviewProps {
-  basePath: string;
-  patientUuid: string;
-}
-
-const AppointmentsOverview: React.FC<AppointmentOverviewProps> = ({ patientUuid }) => (
-  <AppointmentsBase patientUuid={patientUuid} />
-);
-
-export default AppointmentsOverview;
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-table.component.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-table.component.tsx
deleted file mode 100644
index 243de1bb77..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-table.component.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-import React, { useEffect, useMemo } from 'react';
-import classNames from 'classnames';
-import dayjs from 'dayjs';
-const utc = require('dayjs/plugin/utc');
-dayjs.extend(utc);
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  type DataTableHeader,
-  Table,
-  TableCell,
-  TableContainer,
-  TableBody,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@carbon/react';
-import { PatientChartPagination } from '@openmrs/esm-patient-common-lib';
-import { formatDatetime, parseDate, useLayoutType, usePagination } from '@openmrs/esm-framework';
-import { type Appointment } from '../types';
-import { AppointmentsActionMenu } from './appointments-action-menu.component';
-import styles from './appointments-table.scss';
-
-const pageSize = 10;
-
-interface AppointmentTableProps {
-  patientAppointments: Array<Appointment>;
-  switchedView: boolean;
-  setSwitchedView: (value: boolean) => void;
-  patientUuid: string;
-}
-
-const AppointmentsTable: React.FC<AppointmentTableProps> = ({
-  patientAppointments,
-  patientUuid,
-  switchedView,
-  setSwitchedView,
-}) => {
-  const { t } = useTranslation();
-  const { results: paginatedAppointments, currentPage, goTo } = usePagination(patientAppointments, pageSize);
-  const isTablet = useLayoutType() === 'tablet';
-
-  useEffect(() => {
-    if (switchedView && currentPage !== 1) {
-      goTo(1);
-    }
-  }, [switchedView, goTo, currentPage]);
-
-  const tableHeaders: Array<typeof DataTableHeader> = useMemo(
-    () => [
-      { key: 'date', header: t('date', 'Date') },
-      { key: 'location', header: t('location', 'Location') },
-      { key: 'service', header: t('service', 'Service') },
-      { key: 'status', header: t('status', 'Status') },
-      { key: 'type', header: t('type', 'Type') },
-      { key: 'notes', header: t('notes', 'Notes') },
-    ],
-    [t],
-  );
-
-  const tableRows = useMemo(
-    () =>
-      paginatedAppointments?.map((appointment) => {
-        return {
-          id: appointment.uuid,
-          date: formatDatetime(parseDate(appointment.startDateTime), { mode: 'wide' }),
-          location: appointment?.location?.name ? appointment?.location?.name : '——',
-          service: appointment.service.name,
-          status: appointment.status,
-          type: appointment.appointmentKind ? appointment.appointmentKind : '——',
-          notes: appointment.comments ? appointment.comments : '——',
-        };
-      }),
-    [paginatedAppointments],
-  );
-
-  return (
-    <div>
-      <DataTable rows={tableRows} headers={tableHeaders} isSortable size={isTablet ? 'lg' : 'sm'} useZebraStyles>
-        {({ rows, headers, getHeaderProps, getTableProps }) => (
-          <TableContainer>
-            <Table {...getTableProps()}>
-              <TableHead>
-                <TableRow>
-                  {headers.map((header) => (
-                    <TableHeader
-                      className={classNames(styles.productiveHeading01, styles.text02)}
-                      {...getHeaderProps({
-                        header,
-                        isSortable: header.isSortable,
-                      })}
-                    >
-                      {header.header?.content ?? header.header}
-                    </TableHeader>
-                  ))}
-                  <TableHeader />
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {rows.map((row, i) => (
-                  <TableRow key={row.id}>
-                    {row.cells.map((cell) => (
-                      <TableCell key={cell.id}>{cell.value?.content ?? cell.value}</TableCell>
-                    ))}
-                    <TableCell className="cds--table-column-menu">
-                      <AppointmentsActionMenu appointment={paginatedAppointments[i]} patientUuid={patientUuid} />
-                    </TableCell>
-                  </TableRow>
-                ))}
-              </TableBody>
-            </Table>
-          </TableContainer>
-        )}
-      </DataTable>
-      <PatientChartPagination
-        currentItems={paginatedAppointments.length}
-        totalItems={patientAppointments.length}
-        onPageNumberChange={({ page }) => {
-          setSwitchedView(false);
-          goTo(page);
-        }}
-        pageNumber={currentPage}
-        pageSize={pageSize}
-      />
-    </div>
-  );
-};
-
-export default AppointmentsTable;
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-table.scss b/packages/esm-patient-appointments-app/src/appointments/appointments-table.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments.resource.ts b/packages/esm-patient-appointments-app/src/appointments/appointments.resource.ts
deleted file mode 100644
index 79f45c0386..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/appointments.resource.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import dayjs from 'dayjs';
-import useSWR from 'swr';
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { type AppointmentsFetchResponse } from '../types';
-import isToday from 'dayjs/plugin/isToday';
-dayjs.extend(isToday);
-
-const appointmentsSearchUrl = `${restBaseUrl}/appointments/search`;
-
-export function useAppointments(patientUuid: string, startDate: string, abortController: AbortController) {
-  /*
-    SWR isn't meant to make POST requests for data fetching. This is a consequence of the API only exposing this resource via POST.
-    This works but likely isn't recommended.
-  */
-  const fetcher = () =>
-    openmrsFetch(appointmentsSearchUrl, {
-      method: 'POST',
-      signal: abortController.signal,
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: {
-        patientUuid: patientUuid,
-        startDate: startDate,
-      },
-    });
-
-  const { data, error, isLoading, isValidating, mutate } = useSWR<AppointmentsFetchResponse, Error>(
-    appointmentsSearchUrl,
-    fetcher,
-  );
-
-  const appointments = data?.data?.length ? data.data : null;
-
-  const pastAppointments = appointments
-    ?.sort((a, b) => (b.startDateTime > a.startDateTime ? 1 : -1))
-    ?.filter(({ status }) => status !== 'Cancelled')
-    ?.filter(({ startDateTime }) =>
-      dayjs(new Date(startDateTime).toISOString()).isBefore(new Date().setHours(0, 0, 0, 0)),
-    );
-
-  const upcomingAppointments = appointments
-    ?.sort((a, b) => (a.startDateTime > b.startDateTime ? 1 : -1))
-    ?.filter(({ status }) => status !== 'Cancelled')
-    ?.filter(({ startDateTime }) => dayjs(new Date(startDateTime).toISOString()).isAfter(new Date()));
-
-  const todaysAppointments = appointments
-    ?.sort((a, b) => (a.startDateTime > b.startDateTime ? 1 : -1))
-    ?.filter(({ status }) => status !== 'Cancelled')
-    ?.filter(({ startDateTime }) => dayjs(new Date(startDateTime).toISOString()).isToday());
-
-  return {
-    data: data ? { pastAppointments, upcomingAppointments, todaysAppointments } : null,
-    isError: error,
-    isLoading,
-    isValidating,
-    mutate,
-  };
-}
-
-export const cancelAppointment = async (toStatus: string, appointmentUuid: string) => {
-  const omrsDateFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZZ';
-  const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-  const statusChangeTime = dayjs(new Date()).format(omrsDateFormat);
-  const url = `${restBaseUrl}/appointments/${appointmentUuid}/status-change`;
-  return await openmrsFetch(url, {
-    body: { toStatus, onDate: statusChangeTime, timeZone: timeZone },
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-  });
-};
diff --git a/packages/esm-patient-appointments-app/src/appointments/upcoming-appointments-card.component.tsx b/packages/esm-patient-appointments-app/src/appointments/upcoming-appointments-card.component.tsx
deleted file mode 100644
index 7b78ee6c84..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/upcoming-appointments-card.component.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import React, { useEffect, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import isEmpty from 'lodash-es/isEmpty';
-
-import {
-  Checkbox,
-  InlineLoading,
-  InlineNotification,
-  StructuredListHead,
-  StructuredListCell,
-  StructuredListRow,
-  StructuredListBody,
-  StructuredListWrapper,
-} from '@carbon/react';
-import { formatDate, parseDate } from '@openmrs/esm-framework';
-import { useAppointments } from './appointments.resource';
-import { ErrorState } from '@openmrs/esm-patient-common-lib';
-
-import styles from './upcoming-appointments-card.scss';
-import dayjs from 'dayjs';
-interface UpcomingAppointmentsProps {
-  patientUuid: string;
-  setUpcomingAppointment: (value: any) => void;
-}
-
-const UpcomingAppointmentsCard: React.FC<UpcomingAppointmentsProps> = ({ patientUuid, setUpcomingAppointment }) => {
-  const { t } = useTranslation();
-  const startDate = dayjs(new Date().toISOString()).subtract(6, 'month').toISOString();
-  const headerTitle = t('upcomingAppointments', 'Upcoming appointments');
-
-  const ac = useMemo<AbortController>(() => new AbortController(), []);
-  useEffect(() => () => ac.abort(), [ac]);
-  const { data: appointmentsData, isError, isLoading } = useAppointments(patientUuid, startDate, ac);
-
-  const todaysAppointments = appointmentsData?.todaysAppointments?.length ? appointmentsData?.todaysAppointments : [];
-  const futureAppointments = appointmentsData?.upcomingAppointments?.length
-    ? appointmentsData?.upcomingAppointments
-    : [];
-  const appointments = todaysAppointments.concat(futureAppointments);
-  const upcomingAppointment = !isEmpty(appointments)
-    ? appointments?.filter(({ dateHonored }) => dateHonored === null)
-    : [];
-  if (isError) {
-    return <ErrorState headerTitle={headerTitle} error={isError} />;
-  }
-  if (isLoading) {
-    <span>
-      <InlineLoading />
-    </span>;
-  }
-
-  if (upcomingAppointment?.length) {
-    const structuredListBodyRowGenerator = () => {
-      return upcomingAppointment.map((appointment, i) => (
-        <StructuredListRow label key={`row-${i}`} className={styles.structuredList}>
-          <StructuredListCell>{formatDate(parseDate(appointment.startDateTime), { mode: 'wide' })}</StructuredListCell>
-          <StructuredListCell>{appointment.service ? appointment.service.name : '——'}</StructuredListCell>
-          <StructuredListCell>
-            <Checkbox
-              className={styles.checkbox}
-              key={i}
-              labelText=""
-              defaultChecked={dayjs(new Date(appointment.startDateTime).toISOString()).isToday()}
-              id={appointment.uuid}
-              onChange={(e) => (e.target.checked ? setUpcomingAppointment(appointment) : '')}
-            />
-          </StructuredListCell>
-        </StructuredListRow>
-      ));
-    };
-
-    return (
-      <div>
-        <div>
-          <p className={styles.sectionTitle}>{headerTitle}</p>
-          <span className={styles.headerLabel}>
-            {t('appointmentToFulfill', 'Select appointment(s) to fulfill')}
-          </span>{' '}
-        </div>
-
-        <StructuredListWrapper>
-          <StructuredListHead>
-            <StructuredListRow head>
-              <StructuredListCell head>{t('date', 'Date')}</StructuredListCell>
-              <StructuredListCell head>{t('appointmentType', 'Appointment type')}</StructuredListCell>
-              <StructuredListCell head>{t('action', 'Action')}</StructuredListCell>
-            </StructuredListRow>
-          </StructuredListHead>
-          <StructuredListBody>{structuredListBodyRowGenerator()}</StructuredListBody>
-        </StructuredListWrapper>
-      </div>
-    );
-  }
-  return (
-    <InlineNotification
-      kind={'info'}
-      lowContrast
-      className={styles.inlineNotification}
-      title={t('upcomingAppointments', 'Upcoming appointments')}
-      subtitle={t('noUpcomingAppointments', 'No upcoming appointments found')}
-    />
-  );
-};
-
-export default UpcomingAppointmentsCard;
diff --git a/packages/esm-patient-appointments-app/src/appointments/upcoming-appointments-card.scss b/packages/esm-patient-appointments-app/src/appointments/upcoming-appointments-card.scss
deleted file mode 100644
index b9b3c7bcb8..0000000000
--- a/packages/esm-patient-appointments-app/src/appointments/upcoming-appointments-card.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '@openmrs/esm-styleguide/src/vars';
-
-.container {
-  margin: spacing.$spacing-05;
-
-  & section {
-    margin: spacing.$spacing-05 0;
-  }
-}
-
-.sectionTitle {
-  @include type.type-style("heading-compact-02");
-  color: $text-02;
-  margin: 0 0 spacing.$spacing-03 0;
-}
-.checkbox {
-    &:not(:first-child) {
-      margin: 0rem 0rem;
-    }
-  }
-
-  .input {
-    margin: 0rem 1rem 1rem;
-  }
-
-  .headerLabel {
-    @include type.type-style('label-01');
-    color: $text-02;
-  }
-
-  .checkboxContainer {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-  }
-
-  .structuredList {
-    padding: 0.5rem 0.5rem 0.5rem;
-
-  }
-
-  .inlineNotification {
-    width: 100%;
-    max-width: unset;
-    padding: '0rem';
-  }
diff --git a/packages/esm-patient-appointments-app/src/constants.ts b/packages/esm-patient-appointments-app/src/constants.ts
deleted file mode 100644
index e4243ac16a..0000000000
--- a/packages/esm-patient-appointments-app/src/constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const dateFormat = 'DD/MM/YYYY';
diff --git a/packages/esm-patient-appointments-app/src/dashboard.meta.ts b/packages/esm-patient-appointments-app/src/dashboard.meta.ts
deleted file mode 100644
index fcd7822f17..0000000000
--- a/packages/esm-patient-appointments-app/src/dashboard.meta.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const dashboardMeta = {
-  slot: 'patient-chart-appointments-dashboard-slot',
-  columns: 1,
-  title: 'Appointments',
-  path: 'Appointments',
-};
diff --git a/packages/esm-patient-appointments-app/src/declarations.d.ts b/packages/esm-patient-appointments-app/src/declarations.d.ts
deleted file mode 100644
index b2f3aa3b21..0000000000
--- a/packages/esm-patient-appointments-app/src/declarations.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare module '*.css';
-declare module '*.scss';
-declare module '*.png';
diff --git a/packages/esm-patient-appointments-app/src/index.ts b/packages/esm-patient-appointments-app/src/index.ts
deleted file mode 100644
index aa147fcbab..0000000000
--- a/packages/esm-patient-appointments-app/src/index.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, translateFrom } from '@openmrs/esm-framework';
-import { createDashboardLink, registerWorkspace } from '@openmrs/esm-patient-common-lib';
-import { dashboardMeta } from './dashboard.meta';
-import appointmentsOverviewComponent from './appointments/appointments-overview.component';
-import appointmentsDetailedSummaryComponent from './appointments/appointments-detailed-summary.component';
-import upcomingAppointmentsWidgetComponent from './appointments/upcoming-appointments-card.component';
-
-export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
-
-const moduleName = '@openmrs/esm-patient-appointments-app';
-
-const options = {
-  featureName: 'patient-appointments',
-  moduleName,
-};
-
-export function startupApp() {
-  defineConfigSchema(moduleName, {});
-}
-
-export const appointmentsOverview = getSyncLifecycle(appointmentsOverviewComponent, options);
-
-export const appointmentsDetailedSummary = getSyncLifecycle(appointmentsDetailedSummaryComponent, options);
-
-// t('Appointments', 'Appointments')
-export const appointmentsSummaryDashboardLink = getSyncLifecycle(
-  createDashboardLink({ ...dashboardMeta, moduleName }),
-  options,
-);
-
-export const appointmentsCancelConfirmationDialog = getAsyncLifecycle(
-  () => import('./appointments/appointments-cancel-modal.component'),
-  options,
-);
-
-export const upcomingAppointmentsWidget = getSyncLifecycle(upcomingAppointmentsWidgetComponent, options);
diff --git a/packages/esm-patient-appointments-app/src/routes.json b/packages/esm-patient-appointments-app/src/routes.json
deleted file mode 100644
index 02f9cce474..0000000000
--- a/packages/esm-patient-appointments-app/src/routes.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "$schema": "https://json.openmrs.org/routes.schema.json",
-  "backendDependencies": {
-    "webservices.rest": "^2.2.0"
-  },
-  "extensions": [
-    {
-      "name": "appointments-overview-widget",
-      "component": "appointmentsOverview",
-      "order": 8,
-      "meta": {
-        "columnSpan": 4
-      }
-    },
-    {
-      "name": "appointments-details-widget",
-      "component": "appointmentsDetailedSummary",
-      "slot": "patient-chart-appointments-dashboard-slot",
-      "meta": {
-        "columnSpan": 1
-      }
-    },
-    {
-      "name": "appointments-summary-dashboard",
-      "component": "appointmentsSummaryDashboardLink",
-      "slot": "patient-chart-dashboard-slot",
-      "order": 11,
-      "meta": {
-        "columns": 1,
-        "columnSpan": 1,
-        "slot": "patient-chart-appointments-dashboard-slot",
-        "title": "Appointments",
-        "path": "Appointments"
-      }
-    },
-    {
-      "name": "appointment-cancel-confirmation-dialog",
-      "component": "appointmentsCancelConfirmationDialog"
-    },
-    {
-      "name": "upcoming-appointment-widget",
-      "component": "upcomingAppointmentsWidget",
-      "slot": "upcoming-appointment-slot"
-    }
-  ],
-  "pages": []
-}
diff --git a/packages/esm-patient-appointments-app/src/types/index.ts b/packages/esm-patient-appointments-app/src/types/index.ts
deleted file mode 100644
index 13ad9918ee..0000000000
--- a/packages/esm-patient-appointments-app/src/types/index.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import type { OpenmrsResource } from '@openmrs/esm-framework';
-
-export interface AppointmentsFetchResponse {
-  data: Array<Appointment>;
-}
-
-export interface Appointment {
-  appointmentKind: string;
-  appointmentNumber: string;
-  comments: string;
-  endDateTime: Date | number;
-  location: OpenmrsResource;
-  patient: fhir.Patient;
-  provider: OpenmrsResource;
-  providers: Array<OpenmrsResource>;
-  recurring: boolean;
-  service: AppointmentService;
-  startDateTime: string;
-  status: string;
-  dateHonored: Date | number;
-  uuid: string;
-}
-
-export interface ServiceTypes {
-  duration: number;
-  name: string;
-  uuid: string;
-}
-
-export interface AppointmentService {
-  appointmentServiceId: number;
-  color: string;
-  creatorName: string;
-  description: string;
-  durationMins: number;
-  endTime: string;
-  initialAppointmentStatus: string;
-  location: OpenmrsResource;
-  maxAppointmentsLimit: number | null;
-  name: string;
-  speciality: OpenmrsResource;
-  startTime: string;
-  uuid: string;
-  serviceTypes: Array<ServiceTypes>;
-}
diff --git a/packages/esm-patient-appointments-app/translations/am.json b/packages/esm-patient-appointments-app/translations/am.json
deleted file mode 100644
index b2488a10c6..0000000000
--- a/packages/esm-patient-appointments-app/translations/am.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "action": "Action",
-  "add": "Add",
-  "appointmentCancelError": "Error cancelling appointment",
-  "appointmentCancelled": "Appointment cancelled",
-  "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
-  "appointments": "Appointments",
-  "Appointments": "Appointments",
-  "appointmentToFulfill": "Select appointment(s) to fulfill",
-  "appointmentType": "Appointment type",
-  "appointmentType_title": "Appointment Type",
-  "cancel": "Cancel",
-  "cancelAppointment": "Cancel appointment",
-  "cancelAppointmentModalConfirmationText": "Are you sure you want to cancel this appointment?",
-  "date": "Date",
-  "discard": "Discard",
-  "edit": "Edit",
-  "editAppointment": "Edit an appointment",
-  "location": "Location",
-  "noCurrentAppointments": "There are no appointments scheduled for today to display for this patient",
-  "noPastAppointments": "There are no past appointments to display for this patient",
-  "notes": "Notes",
-  "noUpcomingAppointments": "No upcoming appointments found",
-  "noUpcomingAppointmentsForPatient": "There are no upcoming appointments to display for this patient",
-  "past": "Past",
-  "service": "Service",
-  "status": "Status",
-  "today": "Today",
-  "type": "Type",
-  "upcoming": "Upcoming",
-  "upcomingAppointments": "Upcoming appointments"
-}
diff --git a/packages/esm-patient-appointments-app/translations/ar.json b/packages/esm-patient-appointments-app/translations/ar.json
deleted file mode 100644
index f4cded43a2..0000000000
--- a/packages/esm-patient-appointments-app/translations/ar.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "action": "الإجراء",
-  "add": "أضف",
-  "appointmentCancelError": "خطأ في إلغاء الموعد",
-  "appointmentCancelled": "تم إلغاء الموعد",
-  "appointmentCancelledSuccessfully": "تم إلغاء الموعد بنجاح",
-  "appointments": "المواعيد",
-  "Appointments": "المواعيد",
-  "appointmentToFulfill": "حدد الموعد/المواعيد لتنفيذه",
-  "appointmentType": "نوع الموعد",
-  "appointmentType_title": "نوع الموعد",
-  "cancel": "إلغاء",
-  "cancelAppointment": "إلغاء الموعد",
-  "cancelAppointmentModalConfirmationText": "هل أنت متأكد أنك تريد إلغاء هذا الموعد؟",
-  "date": "التاريخ",
-  "discard": "تجاهل",
-  "edit": "تعديل",
-  "editAppointment": "تعديل الموعد",
-  "location": "الموقع",
-  "noCurrentAppointments": "لا توجد مواعيد مجدولة لهذا المريض اليوم",
-  "noPastAppointments": "لا توجد مواعيد سابقة لعرضها لهذا المريض",
-  "notes": "الملاحظات",
-  "noUpcomingAppointments": "لم يتم العثور على مواعيد قادمة",
-  "noUpcomingAppointmentsForPatient": "لا توجد مواعيد قادمة لعرضها لهذا المريض",
-  "past": "الماضي",
-  "service": "الخدمة",
-  "status": "الحالة",
-  "today": "اليوم",
-  "type": "النوع",
-  "upcoming": "القادمة",
-  "upcomingAppointments": "المواعيد القادمة"
-}
diff --git a/packages/esm-patient-appointments-app/translations/en.json b/packages/esm-patient-appointments-app/translations/en.json
deleted file mode 100644
index b2488a10c6..0000000000
--- a/packages/esm-patient-appointments-app/translations/en.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "action": "Action",
-  "add": "Add",
-  "appointmentCancelError": "Error cancelling appointment",
-  "appointmentCancelled": "Appointment cancelled",
-  "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
-  "appointments": "Appointments",
-  "Appointments": "Appointments",
-  "appointmentToFulfill": "Select appointment(s) to fulfill",
-  "appointmentType": "Appointment type",
-  "appointmentType_title": "Appointment Type",
-  "cancel": "Cancel",
-  "cancelAppointment": "Cancel appointment",
-  "cancelAppointmentModalConfirmationText": "Are you sure you want to cancel this appointment?",
-  "date": "Date",
-  "discard": "Discard",
-  "edit": "Edit",
-  "editAppointment": "Edit an appointment",
-  "location": "Location",
-  "noCurrentAppointments": "There are no appointments scheduled for today to display for this patient",
-  "noPastAppointments": "There are no past appointments to display for this patient",
-  "notes": "Notes",
-  "noUpcomingAppointments": "No upcoming appointments found",
-  "noUpcomingAppointmentsForPatient": "There are no upcoming appointments to display for this patient",
-  "past": "Past",
-  "service": "Service",
-  "status": "Status",
-  "today": "Today",
-  "type": "Type",
-  "upcoming": "Upcoming",
-  "upcomingAppointments": "Upcoming appointments"
-}
diff --git a/packages/esm-patient-appointments-app/translations/es.json b/packages/esm-patient-appointments-app/translations/es.json
deleted file mode 100644
index a4e8573f26..0000000000
--- a/packages/esm-patient-appointments-app/translations/es.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "action": "Acción",
-  "add": "Añadir",
-  "appointmentCancelError": "Error al cancelar la cita",
-  "appointmentCancelled": "Cita cancelada",
-  "appointmentCancelledSuccessfully": "Cita cancelada con éxito",
-  "appointments": "Citas",
-  "Appointments": "Citas",
-  "appointmentToFulfill": "Seleccionar cita(s) para cumplir",
-  "appointmentType": "Tipo de cita",
-  "appointmentType_title": "Tipo de cita",
-  "cancel": "Cancelar",
-  "cancelAppointment": "Cancelar cita",
-  "cancelAppointmentModalConfirmationText": "¿Está seguro de que desea cancelar esta cita?",
-  "date": "Fecha",
-  "discard": "Descartar",
-  "edit": "Editar",
-  "editAppointment": "Editar una cita",
-  "location": "Ubicación",
-  "noCurrentAppointments": "No hay citas programadas que mostrar para hoy para este paciente",
-  "noPastAppointments": "No hay citas anteriores para mostrar para este paciente",
-  "notes": "Apuntes",
-  "noUpcomingAppointments": "No hay próximas citas para mostrar para este paciente",
-  "noUpcomingAppointmentsForPatient": "No hay próximas citas para mostrar para este paciente",
-  "past": "Anterior",
-  "service": "Servicio",
-  "status": "Estado",
-  "today": "Hoy",
-  "type": "Tipo",
-  "upcoming": "Próximo/a",
-  "upcomingAppointments": "Próximas citas"
-}
diff --git a/packages/esm-patient-appointments-app/translations/fr.json b/packages/esm-patient-appointments-app/translations/fr.json
deleted file mode 100644
index 2d2ceda958..0000000000
--- a/packages/esm-patient-appointments-app/translations/fr.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "action": "Action",
-  "add": "Ajouter",
-  "appointmentCancelError": "Error cancelling appointment",
-  "appointmentCancelled": "Appointment cancelled",
-  "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
-  "appointments": "Rendez-vous",
-  "Appointments": "Appointments",
-  "appointmentToFulfill": "Select appointment(s) to fulfill",
-  "appointmentType": "Type de rendez-vous",
-  "appointmentType_title": "Appointment Type",
-  "cancel": "Cancel",
-  "cancelAppointment": "Cancel appointment",
-  "cancelAppointmentModalConfirmationText": "Are you sure you want to cancel this appointment?",
-  "date": "Date",
-  "discard": "Abandonner",
-  "edit": "Edit",
-  "editAppointment": "Edit an appointment",
-  "location": "Emplacement",
-  "noCurrentAppointments": "Il n'y a pas de rendez-vous prévu aujourd'hui à afficher pour ce patient",
-  "noPastAppointments": "Il n'y a pas de rendez-vous passé à afficher pour ce patient",
-  "notes": "Notes",
-  "noUpcomingAppointments": "Il n'y a pas de rendez-vous à venir à afficher pour ce patient",
-  "noUpcomingAppointmentsForPatient": "There are no upcoming appointments to display for this patient",
-  "past": "Passé",
-  "service": "Service",
-  "status": "Statut",
-  "today": "Aujourd'hui",
-  "type": "Type",
-  "upcoming": "A venir",
-  "upcomingAppointments": "Upcoming appointments"
-}
diff --git a/packages/esm-patient-appointments-app/translations/he.json b/packages/esm-patient-appointments-app/translations/he.json
deleted file mode 100644
index 12c1011f5c..0000000000
--- a/packages/esm-patient-appointments-app/translations/he.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "action": "פעולה",
-  "add": "הוסף",
-  "appointmentCancelError": "שגיאה בביטול תור",
-  "appointmentCancelled": "התור בוטל",
-  "appointmentCancelledSuccessfully": "התור בוטל בהצלחה",
-  "appointments": "תורים",
-  "Appointments": "תורים",
-  "appointmentToFulfill": "בחר תור(ים) למילוי",
-  "appointmentType": "סוג התור",
-  "appointmentType_title": "סוג התור",
-  "cancel": "ביטול",
-  "cancelAppointment": "ביטול תור",
-  "cancelAppointmentModalConfirmationText": "?האם אתה בטוח שברצונך לבטל תור זה",
-  "date": "תאריך",
-  "discard": "בטל",
-  "edit": "ערוך",
-  "editAppointment": "ערוך תור",
-  "location": "מיקום",
-  "noCurrentAppointments": "אין תורים מתוזמנים להצגה עבור מטופל זה ליום הזה",
-  "noPastAppointments": "אין תורים עבריים להצגה עבור מטופל זה",
-  "notes": "הערות",
-  "noUpcomingAppointments": "אין תורים עתידיים להצגה עבור מטופל זה",
-  "noUpcomingAppointmentsForPatient": "אין תורים עתידיים להצגה עבור מטופל זה",
-  "past": "עבר",
-  "service": "שירות",
-  "status": "סטטוס",
-  "today": "היום",
-  "type": "סוג",
-  "upcoming": "עתידי",
-  "upcomingAppointments": "תורים עתידיים"
-}
diff --git a/packages/esm-patient-appointments-app/translations/km.json b/packages/esm-patient-appointments-app/translations/km.json
deleted file mode 100644
index e7cf0ec160..0000000000
--- a/packages/esm-patient-appointments-app/translations/km.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "action": "សកម្មភាព",
-  "add": "បន្ថែម",
-  "appointmentCancelError": "មានបញ្ហាបច្ចេកទេសក្នុងការលុបចោលការណាត់ជួប",
-  "appointmentCancelled": "ការណាត់ជួបត្រូវបានលុបចោល",
-  "appointmentCancelledSuccessfully": "ការណាត់ជួបបានលុបចោលដោយជោគជ័យ",
-  "appointments": "ការណាត់ជួប",
-  "Appointments": "ការណាត់ជួប",
-  "appointmentToFulfill": "ជ្រើសរើសការណាត់ជួបដើម្បីបំពេញ",
-  "appointmentType": "ប្រភេទនៃការណាត់ជួប",
-  "appointmentType_title": "ប្រភេទនៃការណាត់ជួប",
-  "cancel": "បោះបង់",
-  "cancelAppointment": "លុបចោលការណាត់ជួប",
-  "cancelAppointmentModalConfirmationText": "តើអ្នកពិតជាចង់លុបចោលការណាត់ជួបនេះមែនទេ?",
-  "date": "កាលបរិច្ឆេទ",
-  "discard": "បោះបង់",
-  "edit": "កែសម្រួល",
-  "editAppointment": "កែសម្រួលការណាត់ជួប",
-  "location": "ទីតាំង",
-  "noCurrentAppointments": "មិនមានការណាត់ជួបសម្រាប់ថ្ងៃនេះ ដើម្បីបង្ហាញអ្នកជំងឺនេះទេ",
-  "noPastAppointments": "មិនមានការណាត់ជួបពីមុនដើម្បីបង្ហាញសម្រាប់អ្នកជំងឺនេះទេ",
-  "notes": "កំណត់ចំណាំ",
-  "noUpcomingAppointments": "មិនមានការណាត់ជួបនាពេលខាងមុខដើម្បីបង្ហាញសម្រាប់អ្នកជំងឺនេះទេ",
-  "noUpcomingAppointmentsForPatient": "មិនមានការណាត់ជួបនាពេលខាងមុខដើម្បីបង្ហាញសម្រាប់អ្នកជំងឺនេះទេ",
-  "past": "អតីតកាល",
-  "service": "សេវាកម្ម",
-  "status": "ស្ថានភាព",
-  "today": "ថ្ងៃនេះ",
-  "type": "ប្រភេទ",
-  "upcoming": "នាពេលខាងមុខ",
-  "upcomingAppointments": "ការណាត់ជួបនាពេលខាងមុខ"
-}
diff --git a/packages/esm-patient-appointments-app/translations/zh.json b/packages/esm-patient-appointments-app/translations/zh.json
deleted file mode 100644
index 1050a3f05e..0000000000
--- a/packages/esm-patient-appointments-app/translations/zh.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "action": "操作",
-  "add": "添加",
-  "appointmentCancelError": "取消预约时出现错误",
-  "appointmentCancelled": "预约已取消",
-  "appointmentCancelledSuccessfully": "预约已成功取消",
-  "appointments": "预约",
-  "Appointments": "预约",
-  "appointmentToFulfill": "选择要履行的预约",
-  "appointmentType": "预约类型",
-  "appointmentType_title": "预约类型",
-  "cancel": "取消",
-  "cancelAppointment": "取消预约",
-  "cancelAppointmentModalConfirmationText": "您确定要取消这个预约吗？",
-  "date": "日期",
-  "discard": "放弃",
-  "edit": "编辑",
-  "editAppointment": "编辑一个预约",
-  "location": "地点",
-  "noCurrentAppointments": "该患者没有安排在今日的预约",
-  "noPastAppointments": "该患者没有历史预约",
-  "notes": "备注",
-  "noUpcomingAppointments": "未找到即将到来的预约",
-  "noUpcomingAppointmentsForPatient": "该患者没有即将到来的预约",
-  "past": "过往",
-  "service": "服务",
-  "status": "状态",
-  "today": "今日",
-  "type": "类型",
-  "upcoming": "即将到来",
-  "upcomingAppointments": "即将到来的预约"
-}
diff --git a/packages/esm-patient-appointments-app/translations/zh_CN.json b/packages/esm-patient-appointments-app/translations/zh_CN.json
deleted file mode 100644
index 1050a3f05e..0000000000
--- a/packages/esm-patient-appointments-app/translations/zh_CN.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "action": "操作",
-  "add": "添加",
-  "appointmentCancelError": "取消预约时出现错误",
-  "appointmentCancelled": "预约已取消",
-  "appointmentCancelledSuccessfully": "预约已成功取消",
-  "appointments": "预约",
-  "Appointments": "预约",
-  "appointmentToFulfill": "选择要履行的预约",
-  "appointmentType": "预约类型",
-  "appointmentType_title": "预约类型",
-  "cancel": "取消",
-  "cancelAppointment": "取消预约",
-  "cancelAppointmentModalConfirmationText": "您确定要取消这个预约吗？",
-  "date": "日期",
-  "discard": "放弃",
-  "edit": "编辑",
-  "editAppointment": "编辑一个预约",
-  "location": "地点",
-  "noCurrentAppointments": "该患者没有安排在今日的预约",
-  "noPastAppointments": "该患者没有历史预约",
-  "notes": "备注",
-  "noUpcomingAppointments": "未找到即将到来的预约",
-  "noUpcomingAppointmentsForPatient": "该患者没有即将到来的预约",
-  "past": "过往",
-  "service": "服务",
-  "status": "状态",
-  "today": "今日",
-  "type": "类型",
-  "upcoming": "即将到来",
-  "upcomingAppointments": "即将到来的预约"
-}
diff --git a/packages/esm-patient-appointments-app/tsconfig.json b/packages/esm-patient-appointments-app/tsconfig.json
deleted file mode 100644
index 29fd6726f2..0000000000
--- a/packages/esm-patient-appointments-app/tsconfig.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "include": ["src/**/*", "../../tools/setup-tests.ts"],
-}
diff --git a/packages/esm-patient-appointments-app/webpack.config.js b/packages/esm-patient-appointments-app/webpack.config.js
deleted file mode 100644
index 2c74029c85..0000000000
--- a/packages/esm-patient-appointments-app/webpack.config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('openmrs/default-webpack-config');
diff --git a/packages/esm-patient-attachments-app/src/camera-media-uploader/media-uploader.component.tsx b/packages/esm-patient-attachments-app/src/camera-media-uploader/media-uploader.component.tsx
index e5caf6195e..9b5e77f929 100644
--- a/packages/esm-patient-attachments-app/src/camera-media-uploader/media-uploader.component.tsx
+++ b/packages/esm-patient-attachments-app/src/camera-media-uploader/media-uploader.component.tsx
@@ -23,12 +23,25 @@ const MediaUploaderComponent = () => {
         if (file.size > maxFileSize * 1024 * 1024) {
           setErrorNotification({
             title: t('fileSizeLimitExceededText', 'File size limit exceeded'),
-            subtitle: `${file.name} ${t('fileSizeLimitExceeded', 'exceeds the size limit of')} ${maxFileSize} MB.`,
+            subtitle: `The file "${file.name}" ${t(
+              'fileSizeLimitExceeded',
+              'exceeds the size limit of',
+            )} ${maxFileSize} MB.`,
           });
         } else if (!isFileExtensionAllowed(file.name, allowedExtensions)) {
+          const lastExtension = allowedExtensions.pop();
+
           setErrorNotification({
-            title: t('fileExtensionNotAllowedText', 'File extension is not allowed'),
-            subtitle: `${file.name} ${t('allowedExtensionsAre', 'Allowed extensions are: ')} ${allowedExtensions}.`,
+            title: t('unsupportedFileType', 'Unsupported file type'),
+            subtitle: t(
+              'chooseAnAllowedFileType',
+              'The file "{{fileName}}" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.',
+              {
+                fileName: file.name,
+                lastExtension: lastExtension,
+                supportedExtensions: allowedExtensions.join(', '),
+              },
+            ),
           });
         } else {
           // Convert MBs to bytes
@@ -56,7 +69,14 @@ const MediaUploaderComponent = () => {
     if (!allowedExtensions) {
       return true;
     }
-    const fileExtension = fileName.split('.').pop();
+
+    const match = fileName.match(/\.[^.\s]+$/);
+
+    if (!match) {
+      return false;
+    }
+
+    const fileExtension = match[0].toLowerCase();
     return allowedExtensions?.includes(fileExtension.toLowerCase());
   };
 
@@ -81,7 +101,7 @@ const MediaUploaderComponent = () => {
       </p>
       <div className={styles.uploadFile}>
         <FileUploaderDropContainer
-          accept={allowedExtensions?.map((ext) => '.' + ext) || ['*']}
+          accept={allowedExtensions?.map((ext) => ext) || ['*']}
           labelText={t('fileSizeInstructions', 'Drag and drop files here or click to upload')}
           tabIndex={0}
           multiple={multipleFiles}
diff --git a/packages/esm-patient-attachments-app/translations/en.json b/packages/esm-patient-attachments-app/translations/en.json
index 199c55a1fd..1266ff6a5c 100644
--- a/packages/esm-patient-attachments-app/translations/en.json
+++ b/packages/esm-patient-attachments-app/translations/en.json
@@ -4,7 +4,6 @@
   "addAttachment_title": "Add Attachment",
   "addImage": "Add image +",
   "addMoreAttachments": "Add more attachments",
-  "allowedExtensionsAre": "Allowed extensions are:",
   "attachmentCaptionInstruction": "Enter caption",
   "attachments": "Attachments",
   "Attachments": "Attachments",
@@ -14,6 +13,7 @@
   "cameraError": "Camera Error",
   "cancel": "Cancel",
   "changeImage": "Change image",
+  "chooseAnAllowedFileType": "The file \"{{fileName}}\" cannot be uploaded. Please upload a file with one of the following extensions: {{supportedExtensions}}, or {{ lastExtension }}.",
   "closeModal": "Close",
   "closePreview": "Close preview",
   "dateUploaded": "Date uploaded",
@@ -27,7 +27,6 @@
   "fieldRequired": "This field is required",
   "file": "File",
   "fileDeleted": "File deleted",
-  "fileExtensionNotAllowedText": "File extension is not allowed",
   "fileName": "File name",
   "fileSizeInstructions": "Drag and drop files here or click to upload",
   "fileSizeLimitExceeded": "exceeds the size limit of",
diff --git a/packages/esm-patient-chart-app/src/constants.ts b/packages/esm-patient-chart-app/src/constants.ts
index bffc0fb82b..d01f53acb8 100644
--- a/packages/esm-patient-chart-app/src/constants.ts
+++ b/packages/esm-patient-chart-app/src/constants.ts
@@ -5,3 +5,4 @@ export const spaBasePath = `${window.spaBase}${basePath}`;
 export const moduleName = '@openmrs/esm-patient-chart-app';
 export const patientChartWorkspaceSlot = 'patient-chart-workspace-slot';
 export const patientChartWorkspaceHeaderSlot = 'patient-chart-workspace-header-slot';
+export const omrsDateFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZZ';
diff --git a/packages/esm-patient-chart-app/src/visit/hooks/useUpcomingAppointments.tsx b/packages/esm-patient-chart-app/src/visit/hooks/useUpcomingAppointments.tsx
index a878cbb253..4c8f8db0d9 100644
--- a/packages/esm-patient-chart-app/src/visit/hooks/useUpcomingAppointments.tsx
+++ b/packages/esm-patient-chart-app/src/visit/hooks/useUpcomingAppointments.tsx
@@ -1,5 +1,6 @@
 import dayjs from 'dayjs';
-import { openmrsFetch, restBaseUrl, type OpenmrsResource } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl, type OpenmrsResource, useAbortController } from '@openmrs/esm-framework';
+import { omrsDateFormat } from '../../constants';
 
 export interface AppointmentPayload {
   patientUuid: string;
@@ -17,13 +18,17 @@ export interface AppointmentPayload {
   dateHonored?: string;
 }
 
-export function saveAppointment(appointment: AppointmentPayload, abortController: AbortController) {
-  return openmrsFetch(`${restBaseUrl}/appointment`, {
+export const updateAppointmentStatus = async (
+  toStatus: string,
+  appointmentUuid: string,
+  abortController: AbortController,
+) => {
+  const statusChangeTime = dayjs().format(omrsDateFormat);
+  const url = `${restBaseUrl}/appointments/${appointmentUuid}/status-change`;
+  return await openmrsFetch(url, {
+    body: { toStatus, onDate: statusChangeTime },
     method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
     signal: abortController.signal,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: appointment,
   });
-}
+};
diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
index 9318b04a3d..d698aa241f 100644
--- a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
+++ b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
@@ -44,7 +44,7 @@ import {
 import { MemoizedRecommendedVisitType } from './recommended-visit-type.component';
 import { type ChartConfig } from '../../config-schema';
 import { saveQueueEntry } from '../hooks/useServiceQueue';
-import { type AppointmentPayload, saveAppointment } from '../hooks/useUpcomingAppointments';
+import { updateAppointmentStatus } from '../hooks/useUpcomingAppointments';
 import { useLocations } from '../hooks/useLocations';
 import { useVisitQueueEntry } from '../queue-entry/queue.resource';
 import BaseVisitType from './base-visit-type.component';
@@ -375,28 +375,16 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({
                   );
                 }
                 if (config.showUpcomingAppointments && upcomingAppointment) {
-                  const appointmentPayload: AppointmentPayload = {
-                    appointmentKind: upcomingAppointment?.appointmentKind,
-                    serviceUuid: upcomingAppointment?.service.uuid,
-                    startDateTime: upcomingAppointment?.startDateTime,
-                    endDateTime: upcomingAppointment?.endDateTime,
-                    locationUuid: visitLocation?.uuid,
-                    patientUuid: patientUuid,
-                    uuid: upcomingAppointment?.uuid,
-                    dateHonored: dayjs(visitStartDate).format(),
-                  };
-                  saveAppointment(appointmentPayload, abortController).then(
-                    ({ status }) => {
-                      if (status === 201) {
-                        mutateCurrentVisit();
-                        mutateVisits();
-                        showSnackbar({
-                          isLowContrast: true,
-                          kind: 'success',
-                          subtitle: t('appointmentUpdate', 'Upcoming appointment updated successfully'),
-                          title: t('appointmentEdited', 'Appointment edited'),
-                        });
-                      }
+                  updateAppointmentStatus('CheckedIn', upcomingAppointment?.uuid, abortController).then(
+                    () => {
+                      mutateCurrentVisit();
+                      mutateVisits();
+                      showSnackbar({
+                        isLowContrast: true,
+                        kind: 'success',
+                        subtitle: t('appointmentMarkedChecked', 'Appointment marked as Checked In'),
+                        title: t('appointmentCheckedIn', 'Appointment Checked In'),
+                      });
                     },
                     (error) => {
                       showSnackbar({
diff --git a/packages/esm-patient-chart-app/translations/en.json b/packages/esm-patient-chart-app/translations/en.json
index b713cdef52..7bde1db556 100644
--- a/packages/esm-patient-chart-app/translations/en.json
+++ b/packages/esm-patient-chart-app/translations/en.json
@@ -5,9 +5,9 @@
   "all": "All",
   "allEncounters": "All encounters",
   "Allergies dashboard": "Allergies dashboard",
-  "appointmentEdited": "Appointment edited",
+  "appointmentCheckedIn": "Appointment checked in",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "Appointments dashboard": "Appointments dashboard",
-  "appointmentUpdate": "Upcoming appointment updated successfully",
   "Attachments dashboard": "Attachments dashboard",
   "cancel": "Cancel",
   "cancelActiveVisitConfirmation": "Are you sure you want to cancel this active visit?",
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.component.tsx
index 4b1bdad552..80ff4e92a8 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.component.tsx
@@ -19,9 +19,9 @@ import {
 import { Add } from '@carbon/react/icons';
 import { formatDate, parseDate, useLayoutType } from '@openmrs/esm-framework';
 import { CardHeader, EmptyState, ErrorState, launchPatientWorkspace } from '@openmrs/esm-patient-common-lib';
-import { useConditions } from './conditions.resource';
 import { ConditionsActionMenu } from './conditions-action-menu.component';
 import { compare } from './utils';
+import { useConditions } from './conditions.resource';
 import styles from './conditions-detailed-summary.scss';
 
 function ConditionsDetailedSummary({ patient }) {
@@ -71,6 +71,7 @@ function ConditionsDetailedSummary({ patient }) {
         ...condition,
         id: condition.id,
         condition: condition.display,
+        abatementDateTime: condition.abatementDateTime,
         onsetDateTime: {
           sortKey: condition.onsetDateTime ?? '',
           content: condition.onsetDateTime
@@ -88,7 +89,13 @@ function ConditionsDetailedSummary({ patient }) {
       : compare(cellA.sortKey, cellB.sortKey);
   };
 
-  const launchConditionsForm = useCallback(() => launchPatientWorkspace('conditions-form-workspace'), []);
+  const launchConditionsForm = useCallback(
+    () =>
+      launchPatientWorkspace('conditions-form-workspace', {
+        formContext: 'creating',
+      }),
+    [],
+  );
 
   const handleConditionStatusChange = ({ selectedItem }) => setFilter(selectedItem);
 
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.test.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.test.tsx
index 125d75ad10..75ed0f1b71 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.test.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.test.tsx
@@ -92,7 +92,7 @@ it('clicking the Add button or Record Conditions link launches the conditions fo
   await user.click(recordConditionsLink);
 
   expect(launchPatientWorkspace).toHaveBeenCalledTimes(1);
-  expect(launchPatientWorkspace).toHaveBeenCalledWith('conditions-form-workspace');
+  expect(launchPatientWorkspace).toHaveBeenCalledWith('conditions-form-workspace', { formContext: 'creating' });
 });
 
 function renderConditionsDetailedSummary() {
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
index 88042796da..5192577943 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-form.component.tsx
@@ -15,14 +15,14 @@ interface ConditionFormProps extends DefaultWorkspaceProps {
   formContext: 'creating' | 'editing';
 }
 
-const conditionSchema = z.object({
+const schema = z.object({
+  abatementDateTime: z.date().optional().nullable(),
   clinicalStatus: z.string(),
-  endDate: z.date().optional(),
+  conditionName: z.string({ required_error: 'A condition is required' }),
   onsetDateTime: z.date().nullable(),
-  search: z.string({ required_error: 'A condition is required' }),
 });
 
-export type ConditionFormData = z.infer<typeof conditionSchema>;
+export type ConditionSchema = z.infer<typeof schema>;
 
 const ConditionsForm: React.FC<ConditionFormProps> = ({
   closeWorkspace,
@@ -33,52 +33,68 @@ const ConditionsForm: React.FC<ConditionFormProps> = ({
   promptBeforeClosing,
 }) => {
   const { t } = useTranslation();
+
   const isTablet = useLayoutType() === 'tablet';
   const { conditions } = useConditions(patientUuid);
-  const matchingCondition = conditions?.find((c) => c?.id === condition?.id);
-
   const [isSubmittingForm, setIsSubmittingForm] = useState(false);
   const [errorCreating, setErrorCreating] = useState(null);
   const [errorUpdating, setErrorUpdating] = useState(null);
+  const matchingCondition = conditions?.find((c) => c?.id === condition?.id);
 
-  const methods = useForm<ConditionFormData>({
+  const methods = useForm<ConditionSchema>({
     mode: 'all',
-    resolver: zodResolver(conditionSchema),
+    resolver: zodResolver(schema),
     defaultValues: {
+      abatementDateTime:
+        formContext == 'editing'
+          ? matchingCondition?.abatementDateTime
+            ? new Date(matchingCondition?.abatementDateTime)
+            : null
+          : null,
+      conditionName: '',
+      clinicalStatus: condition?.cells?.find((cell) => cell?.info?.header === 'clinicalStatus')?.value ?? '',
       onsetDateTime:
         formContext == 'editing'
           ? matchingCondition?.onsetDateTime
             ? new Date(matchingCondition?.onsetDateTime)
             : null
           : null,
-      clinicalStatus: condition?.cells?.find((cell) => cell?.info?.header === 'clinicalStatus')?.value ?? 'Active',
-      search: '',
     },
   });
 
   const {
     setError,
-    formState: { isDirty, errors },
+    formState: { isDirty },
   } = methods;
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
   }, [isDirty]);
 
-  const onSubmit: SubmitHandler<ConditionFormData> = (data) => {
+  const onSubmit: SubmitHandler<ConditionSchema> = (payload) => {
     setIsSubmittingForm(true);
-    if (formContext === 'creating' && !data.search.trim()) {
-      setError('search', {
-        type: 'manual',
-        message: t('conditionRequired', 'A condition is required'),
-      });
+
+    if (formContext === 'creating') {
+      if (!payload.conditionName.trim()) {
+        setError('conditionName', {
+          type: 'manual',
+          message: t('conditionRequired', 'A condition is required'),
+        });
+      }
+      if (!payload.clinicalStatus) {
+        setError('clinicalStatus', {
+          type: 'manual',
+          message: t('clinicalStatusRequired', 'A clinical status is required'),
+        });
+      }
       setIsSubmittingForm(false);
-      return;
     }
+
     setIsSubmittingForm(true);
   };
 
-  const onError = (error) => {
+  const onError = (e) => {
+    console.error('Error submitting condition: ', e);
     setIsSubmittingForm(false);
   };
 
@@ -86,13 +102,13 @@ const ConditionsForm: React.FC<ConditionFormProps> = ({
     <FormProvider {...methods}>
       <Form className={styles.form} onSubmit={methods.handleSubmit(onSubmit, onError)}>
         <ConditionsWidget
-          patientUuid={patientUuid}
           closeWorkspaceWithSavedChanges={closeWorkspaceWithSavedChanges}
           conditionToEdit={condition}
           editing={formContext === 'editing'}
+          isSubmittingForm={isSubmittingForm}
+          patientUuid={patientUuid}
           setErrorCreating={setErrorCreating}
           setErrorUpdating={setErrorUpdating}
-          isSubmittingForm={isSubmittingForm}
           setIsSubmittingForm={setIsSubmittingForm}
         />
         <div>
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-form.scss b/packages/esm-patient-conditions-app/src/conditions/conditions-form.scss
index 61e0273954..096955ee09 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-form.scss
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-form.scss
@@ -3,7 +3,16 @@
 @import '@openmrs/esm-styleguide/src/vars';
 
 .condition {
-  padding: 1rem 0.75rem;
+  padding: 0.75rem;
+  border-top: 0.0625rem solid $grey-2;
+
+  &:first-of-type {
+    border-top: none;
+  }
+
+  &:last-of-type {
+    border-bottom: none;
+  }
 }
 
 .conditionsList {
@@ -66,7 +75,7 @@
 
 .conditionsError {
   :global(.cds--search-input):focus {
-    outline: 2.5px solid $danger
+    outline: 2px solid $danger
   }
 
   :global(.cds--search-magnifier) {
@@ -86,6 +95,10 @@
   :global(.cds--radio-button-wrapper) {
     margin-block-end: .375rem !important;
   }
+
+  :global(.cds--radio-button__validation-msg) {
+    display: none;
+  }
 }
 
 .spinner {
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
index 5c1a94d231..52994ca66a 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
@@ -69,11 +69,11 @@ describe('Conditions Form', () => {
 
     expect(screen.getByRole('group', { name: /Condition/i })).toBeInTheDocument();
     expect(screen.getByRole('textbox', { name: /Onset date/i })).toBeInTheDocument();
-    expect(screen.getByRole('group', { name: /Current status/i })).toBeInTheDocument();
+    expect(screen.getByRole('group', { name: /Clinical status/i })).toBeInTheDocument();
     expect(screen.getByRole('searchbox', { name: /Enter condition/i })).toBeInTheDocument();
     expect(screen.getByRole('button', { name: /Clear search input/i })).toBeInTheDocument();
     expect(screen.getByRole('radio', { name: 'Active' })).toBeInTheDocument();
-    expect(screen.getByRole('radio', { name: 'Active' })).toBeChecked();
+    expect(screen.getByRole('radio', { name: 'Active' })).not.toBeChecked();
     expect(screen.getByRole('radio', { name: 'Inactive' })).toBeInTheDocument();
     expect(screen.getByRole('radio', { name: 'Inactive' })).not.toBeChecked();
 
@@ -86,55 +86,41 @@ describe('Conditions Form', () => {
 
   it('closes the form and the workspace when the cancel button is clicked', async () => {
     const user = userEvent.setup();
-
     renderConditionsForm();
 
     const cancelButton = screen.getByRole('button', { name: /Cancel/i });
-
     await user.click(cancelButton);
-
     expect(testProps.closeWorkspace).toHaveBeenCalledTimes(1);
   });
 
   it('setting the status of a condition to "inactive" reveals an input for recording the end date', async () => {
     const user = userEvent.setup();
-
     renderConditionsForm();
 
     expect(screen.getByText('Condition')).toBeInTheDocument();
-
     await user.click(screen.getByRole('radio', { name: /Inactive/i }));
-
     expect(screen.getByLabelText(/End date/i)).toBeInTheDocument();
   });
 
   it('renders a list of related condition concepts when the user types in the searchbox', async () => {
     const user = userEvent.setup();
-
     renderConditionsForm();
 
     const conditionSearchInput = screen.getByRole('searchbox', { name: /enter condition/i });
-
     expect(screen.queryByRole('menuitem', { name: /Headache/i })).not.toBeInTheDocument();
     expect(screen.queryByDisplayValue('Headache')).not.toBeInTheDocument();
-
     await user.type(conditionSearchInput, 'Headache');
-
     expect(screen.getByDisplayValue(/headache/i)).toBeInTheDocument();
   });
 
   it('renders an error message when no matching conditions are found', async () => {
     const user = userEvent.setup();
-
     renderConditionsForm();
 
     const conditionSearchInput = screen.getByRole('searchbox', { name: /enter condition/i });
-
     expect(screen.queryByRole('menuitem', { name: /Post-acute sequelae of COVID-19/i })).not.toBeInTheDocument();
     expect(screen.queryByDisplayValue(/Post-acute sequelae of COVID-19/i)).not.toBeInTheDocument();
-
     await user.type(conditionSearchInput, 'Post-acute sequelae of COVID-19');
-
     expect(getByTextWithMarkup('No results for "Post-acute sequelae of COVID-19"')).toBeInTheDocument();
   });
 
@@ -155,21 +141,16 @@ describe('Conditions Form', () => {
     const activeStatusInput = screen.getByRole('radio', { name: 'Active' });
     const conditionSearchInput = screen.getByRole('searchbox', { name: /enter condition/i });
     const onsetDateInput = screen.getByRole('textbox', { name: /onset date/i });
-
     expect(cancelButton).not.toBeDisabled();
-
     await user.type(conditionSearchInput, 'Headache');
     await user.click(screen.getByRole('menuitem', { name: /headache/i }));
+    await user.click(activeStatusInput);
     await user.type(onsetDateInput, '2020-05-05');
-
-    expect(activeStatusInput).toBeChecked();
-
     await user.click(submitButton);
   });
 
   it('renders an error notification if there was a problem recording a condition', async () => {
     const user = userEvent.setup();
-
     renderConditionsForm();
 
     const submitButton = screen.getByRole('button', { name: /save & close/i });
@@ -186,15 +167,12 @@ describe('Conditions Form', () => {
     };
 
     mockCreateCondition.mockImplementation(() => Promise.reject(error));
-
     await user.type(conditionSearchInput, 'Headache');
     await user.click(screen.getByRole('menuitem', { name: /Headache/i }));
     await user.type(onsetDateInput, '2020-05-05');
     await user.click(activeStatusInput);
-
     expect(activeStatusInput).toBeChecked();
     expect(submitButton).not.toBeDisabled();
-
     await user.click(submitButton);
   });
 });
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-overview.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-overview.component.tsx
index 36dd5b4f00..1945d1f0ed 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-overview.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-overview.component.tsx
@@ -54,7 +54,13 @@ const ConditionsOverview: React.FC<ConditionsOverviewProps> = ({ patientUuid })
 
   const { conditions, isError, isLoading, isValidating } = useConditions(patientUuid);
   const [filter, setFilter] = useState<'All' | 'Active' | 'Inactive'>('Active');
-  const launchConditionsForm = useCallback(() => launchPatientWorkspace('conditions-form-workspace'), []);
+  const launchConditionsForm = useCallback(
+    () =>
+      launchPatientWorkspace('conditions-form-workspace', {
+        formContext: 'creating',
+      }),
+    [],
+  );
 
   const filteredConditions = useMemo(() => {
     if (!filter || filter == 'All') {
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx
index f9340eb68a..e53160031e 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-overview.test.tsx
@@ -117,7 +117,7 @@ describe('ConditionsOverview: ', () => {
     await user.click(recordConditionsLink);
 
     expect(launchPatientWorkspace).toHaveBeenCalledTimes(1);
-    expect(launchPatientWorkspace).toHaveBeenCalledWith('conditions-form-workspace');
+    expect(launchPatientWorkspace).toHaveBeenCalledWith('conditions-form-workspace', { formContext: 'creating' });
   });
 });
 
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
index 059a229a74..18d6723e2a 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions-widget.component.tsx
@@ -1,5 +1,5 @@
 import React, { type Dispatch, useCallback, useEffect, useRef, useState } from 'react';
-import { useTranslation } from 'react-i18next';
+import { type TFunction, useTranslation } from 'react-i18next';
 import classNames from 'classnames';
 import dayjs from 'dayjs';
 import 'dayjs/plugin/utc';
@@ -23,48 +23,53 @@ import { type DefaultWorkspaceProps } from '@openmrs/esm-patient-common-lib';
 import {
   type CodedCondition,
   type ConditionDataTableRow,
-  createCondition,
   type FormFields,
+  createCondition,
   updateCondition,
   useConditions,
   useConditionsSearch,
 } from './conditions.resource';
-import { type ConditionFormData } from './conditions-form.component';
+import { type ConditionSchema } from './conditions-form.component';
 import styles from './conditions-form.scss';
 
 interface ConditionsWidgetProps {
   closeWorkspaceWithSavedChanges?: DefaultWorkspaceProps['closeWorkspaceWithSavedChanges'];
   conditionToEdit?: ConditionDataTableRow;
   editing?: boolean;
+  isSubmittingForm: boolean;
   patientUuid: string;
-  setHasSubmissibleValue?: (value: boolean) => void;
   setErrorCreating?: (error: Error) => void;
   setErrorUpdating?: (error: Error) => void;
-  isSubmittingForm: boolean;
+  setHasSubmissibleValue?: (value: boolean) => void;
   setIsSubmittingForm: Dispatch<boolean>;
 }
 
+interface RequiredFieldLabelProps {
+  label: string;
+  t: TFunction;
+}
+
 const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
   closeWorkspaceWithSavedChanges,
   conditionToEdit,
   editing,
-  patientUuid,
   isSubmittingForm,
-  setIsSubmittingForm,
+  patientUuid,
   setErrorCreating,
   setErrorUpdating,
+  setIsSubmittingForm,
 }) => {
   const { t } = useTranslation();
   const { conditions, mutate } = useConditions(patientUuid);
   const {
     control,
-    watch,
-    getValues,
     formState: { errors },
-  } = useFormContext<ConditionFormData>();
+    getValues,
+    watch,
+  } = useFormContext<ConditionSchema>();
   const session = useSession();
   const searchInputRef = useRef(null);
-  const currentStatus = watch('clinicalStatus');
+  const clinicalStatus = watch('clinicalStatus');
   const matchingCondition = conditions?.find((condition) => condition?.id === conditionToEdit?.id);
 
   const getFieldValue = (
@@ -79,10 +84,12 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
 
   const displayName = getFieldValue(conditionToEdit?.cells, 'display');
   const editableClinicalStatus = getFieldValue(conditionToEdit?.cells, 'clinicalStatus');
+  const editableAbatementDateTime = getFieldValue(conditionToEdit?.cells, 'abatementDateTime');
   const [selectedCondition, setSelectedCondition] = useState<CodedCondition>(null);
   const [searchTerm, setSearchTerm] = useState('');
   const debouncedSearchTerm = useDebounce(searchTerm);
   const { searchResults, isSearching } = useConditionsSearch(debouncedSearchTerm);
+
   const handleConditionChange = useCallback((selectedCondition: CodedCondition) => {
     setSelectedCondition(selectedCondition);
   }, []);
@@ -96,7 +103,7 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
       clinicalStatus: getValues('clinicalStatus'),
       conceptId: selectedCondition?.concept?.uuid,
       display: selectedCondition?.concept?.display,
-      endDate: getValues('endDate') ? dayjs(getValues('endDate')).format() : null,
+      abatementDateTime: getValues('abatementDateTime') ? dayjs(getValues('abatementDateTime')).format() : null,
       onsetDateTime: getValues('onsetDateTime') ? dayjs(getValues('onsetDateTime')).format() : null,
       patientId: patientUuid,
       userId: session?.user?.uuid,
@@ -138,7 +145,11 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
       clinicalStatus: editing ? getValues('clinicalStatus') : editableClinicalStatus,
       conceptId: matchingCondition?.conceptId,
       display: displayName,
-      endDate: getValues('endDate') ? dayjs(getValues('endDate')).format() : null,
+      abatementDateTime: editing
+        ? getValues('abatementDateTime')
+          ? dayjs(getValues('abatementDateTime')).format()
+          : editableAbatementDateTime
+        : null,
       onsetDateTime: getValues('onsetDateTime') ? dayjs(getValues('onsetDateTime')).format() : null,
       patientId: patientUuid,
       userId: session?.user?.uuid,
@@ -186,7 +197,7 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
   const handleSearchTermChange = (event: React.ChangeEvent<HTMLInputElement>) => setSearchTerm(event.target.value);
 
   useEffect(() => {
-    if (errors?.search) {
+    if (errors?.conditionName) {
       focusOnSearchInput();
     }
     if (isSubmittingForm) {
@@ -202,26 +213,15 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
   return (
     <div className={styles.formContainer}>
       <Stack gap={7}>
-        <FormGroup
-          legendText={
-            <>
-              <span>{t('condition', 'Condition')}</span>
-              {!editing && (
-                <span title={t('required', 'Required')} className={styles.required}>
-                  *
-                </span>
-              )}
-            </>
-          }
-        >
+        <FormGroup legendText={<RequiredFieldLabel label={t('condition', 'Condition')} t={t} />}>
           {editing ? (
             <FormLabel className={styles.conditionLabel}>{displayName}</FormLabel>
           ) : (
             <>
               <Controller
-                name="search"
+                name="conditionName"
                 control={control}
-                render={({ field: { onChange, value, onBlur } }) => (
+                render={({ field: { onChange, value } }) => (
                   <ResponsiveWrapper>
                     <Search
                       autoFocus
@@ -231,14 +231,13 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
                       labelText={t('enterCondition', 'Enter condition')}
                       placeholder={t('searchConditions', 'Search conditions')}
                       className={classNames({
-                        [styles.conditionsError]: errors?.search,
+                        [styles.conditionsError]: errors?.conditionName,
                       })}
                       onChange={(e) => {
                         onChange(e);
                         handleSearchTermChange(e);
                       }}
-                      renderIcon={errors?.search && ((props) => <WarningFilled fill="red" {...props} />)}
-                      onBlur={onBlur}
+                      renderIcon={errors?.conditionName && ((props) => <WarningFilled fill="red" {...props} />)}
                       onClear={() => {
                         setSearchTerm('');
                         setSelectedCondition(null);
@@ -256,7 +255,7 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
                   </ResponsiveWrapper>
                 )}
               />
-              {errors?.search && <p className={styles.errorMessage}>{errors?.search?.message}</p>}
+              {errors?.conditionName && <p className={styles.errorMessage}>{errors?.conditionName?.message}</p>}
               {(() => {
                 if (!debouncedSearchTerm || selectedCondition) return null;
                 if (isSearching)
@@ -264,12 +263,11 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
                 if (searchResults && searchResults.length) {
                   return (
                     <ul className={styles.conditionsList}>
-                      {/*TODO: use uuid instead of index as the key*/}
-                      {searchResults?.map((searchResult, index) => (
+                      {searchResults?.map((searchResult) => (
                         <li
                           role="menuitem"
                           className={styles.condition}
-                          key={index}
+                          key={searchResult?.concept?.uuid}
                           onClick={() => handleConditionChange(searchResult)}
                         >
                           {searchResult.display}
@@ -313,51 +311,69 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
             )}
           />
         </FormGroup>
-        <FormGroup legendText={t('currentStatus', 'Current status')}>
+        <FormGroup legendText={<RequiredFieldLabel label={t('clinicalStatus', 'Clinical status')} t={t} />}>
           <Controller
             name="clinicalStatus"
             control={control}
             render={({ field: { onChange, value, onBlur } }) => (
               <RadioButtonGroup
                 className={styles.radioGroup}
-                valueSelected={value.toLowerCase()}
+                invalid={errors?.clinicalStatus}
                 name="clinicalStatus"
-                orientation="vertical"
-                onChange={onChange}
                 onBlur={onBlur}
+                onChange={onChange}
+                orientation="vertical"
+                valueSelected={value.toLowerCase()}
               >
-                <RadioButton id="active" labelText="Active" value="active" />
-                <RadioButton id="inactive" labelText="Inactive" value="inactive" />
+                <RadioButton id="active" labelText={t('active', 'Active')} value="active" />
+                <RadioButton id="inactive" labelText={t('inactive', 'Inactive')} value="inactive" />
               </RadioButtonGroup>
             )}
           />
+          {errors?.clinicalStatus && <p className={styles.errorMessage}>{errors?.clinicalStatus?.message}</p>}
         </FormGroup>
-        {currentStatus === 'inactive' && (
-          <Controller
-            name="endDate"
-            control={control}
-            render={({ field: { onBlur, onChange, value } }) => (
-              <ResponsiveWrapper>
-                <DatePicker
-                  id="endDate"
-                  datePickerType="single"
-                  dateFormat="d/m/Y"
-                  minDate={new Date(watch('onsetDateTime')).toISOString()}
-                  maxDate={dayjs().utc().format()}
-                  placeholder="dd/mm/yyyy"
-                  onChange={([date]) => onChange(date)}
-                  onBlur={onBlur}
-                  value={value}
-                >
-                  <DatePickerInput id="endDateInput" labelText={t('endDate', 'End date')} />
-                </DatePicker>
-              </ResponsiveWrapper>
-            )}
-          />
+        {(clinicalStatus.match(/inactive/i) || matchingCondition?.clinicalStatus?.match(/inactive/i)) && (
+          <FormGroup legendText="">
+            <Controller
+              name="abatementDateTime"
+              control={control}
+              render={({ field: { onBlur, onChange, value } }) => (
+                <>
+                  <ResponsiveWrapper>
+                    <DatePicker
+                      id="endDate"
+                      datePickerType="single"
+                      dateFormat="d/m/Y"
+                      minDate={new Date(watch('abatementDateTime')).toISOString()}
+                      maxDate={dayjs().utc().format()}
+                      placeholder="dd/mm/yyyy"
+                      onChange={([date]) => onChange(date)}
+                      onBlur={onBlur}
+                      value={value}
+                    >
+                      <DatePickerInput id="abatementDateTime" labelText={t('endDate', 'End date')} />
+                    </DatePicker>
+                  </ResponsiveWrapper>
+                </>
+              )}
+            />
+          </FormGroup>
         )}
       </Stack>
     </div>
   );
 };
 
+function RequiredFieldLabel({ label, t }: RequiredFieldLabelProps) {
+  return (
+    <>
+      <span>{label}</span>
+
+      <span title={t('required', 'Required')} className={styles.required}>
+        *
+      </span>
+    </>
+  );
+}
+
 export default ConditionsWidget;
diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions.resource.ts b/packages/esm-patient-conditions-app/src/conditions/conditions.resource.ts
index 1ff5b26dd8..b04a2185e1 100644
--- a/packages/esm-patient-conditions-app/src/conditions/conditions.resource.ts
+++ b/packages/esm-patient-conditions-app/src/conditions/conditions.resource.ts
@@ -9,6 +9,7 @@ export type Condition = {
   onsetDateTime: string;
   recordedDate: string;
   id: string;
+  abatementDateTime?: string;
 };
 
 export interface ConditionDataTableRow {
@@ -51,7 +52,6 @@ type CreatePayload = {
       },
     ];
   };
-  endDate: string;
   onsetDateTime: string;
   recorder: {
     reference: string;
@@ -61,6 +61,7 @@ type CreatePayload = {
   subject: {
     reference: string;
   };
+  abatementDateTime?: string;
 };
 
 type EditPayload = CreatePayload & {
@@ -71,7 +72,7 @@ export type FormFields = {
   clinicalStatus: string;
   conceptId: string;
   display: string;
-  endDate: string;
+  abatementDateTime: string;
   onsetDateTime: string;
   patientId: string;
   userId: string;
@@ -79,7 +80,6 @@ export type FormFields = {
 
 export function useConditions(patientUuid: string) {
   const conditionsUrl = `${fhirBaseUrl}/Condition?patient=${patientUuid}&_count=100`;
-
   const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: FHIRConditionResponse }, Error>(
     patientUuid ? conditionsUrl : null,
     openmrsFetch,
@@ -105,9 +105,7 @@ export function useConditions(patientUuid: string) {
 export function useConditionsSearch(conditionToLookup: string) {
   const config = useConfig();
   const conditionConceptClassUuid = config?.conditionConceptClassUuid;
-
   const conditionsSearchUrl = `${restBaseUrl}/conceptsearch?conceptClasses=${conditionConceptClassUuid}&q=${conditionToLookup}`;
-
   const { data, error, isLoading } = useSWR<{ data: { results: Array<CodedCondition> } }, Error>(
     conditionToLookup ? conditionsSearchUrl : null,
     openmrsFetch,
@@ -126,6 +124,7 @@ function mapConditionProperties(condition: FHIRCondition): Condition {
     clinicalStatus: status ? status.charAt(0).toUpperCase() + status.slice(1).toLowerCase() : '',
     conceptId: condition?.code?.coding[0]?.code,
     display: condition?.code?.coding[0]?.display,
+    abatementDateTime: condition?.abatementDateTime,
     onsetDateTime: condition?.onsetDateTime,
     recordedDate: condition?.recordedDate,
     id: condition?.id,
@@ -153,7 +152,7 @@ export async function createCondition(payload: FormFields) {
         },
       ],
     },
-    endDate: payload.endDate,
+    abatementDateTime: payload.abatementDateTime,
     onsetDateTime: payload.onsetDateTime,
     recorder: {
       reference: `Practitioner/${payload.userId}`,
@@ -198,7 +197,7 @@ export async function updateCondition(conditionId, payload: FormFields) {
         },
       ],
     },
-    endDate: payload.endDate,
+    abatementDateTime: payload.abatementDateTime,
     id: conditionId,
     onsetDateTime: payload.onsetDateTime,
     recorder: {
diff --git a/packages/esm-patient-conditions-app/src/types/index.ts b/packages/esm-patient-conditions-app/src/types/index.ts
index fbaf3e30ff..4b977aee4f 100644
--- a/packages/esm-patient-conditions-app/src/types/index.ts
+++ b/packages/esm-patient-conditions-app/src/types/index.ts
@@ -10,6 +10,7 @@ export interface FHIRConditionResponse {
   total: number;
   type: string;
 }
+
 export interface FHIRCondition {
   clinicalStatus: {
     coding: Array<CodingData>;
@@ -36,6 +37,7 @@ export interface FHIRCondition {
     div: string;
     status: string;
   };
+  abatementDateTime?: string;
 }
 
 export interface CodingData {
diff --git a/packages/esm-patient-conditions-app/translations/en.json b/packages/esm-patient-conditions-app/translations/en.json
index 068734dc61..1f6dbeb2cd 100644
--- a/packages/esm-patient-conditions-app/translations/en.json
+++ b/packages/esm-patient-conditions-app/translations/en.json
@@ -1,16 +1,18 @@
 {
+  "active": "Active",
   "add": "Add",
   "cancel": "Cancel",
   "checkFilters": "Check the filters above",
+  "clinicalStatus": "Clinical status",
+  "clinicalStatusRequired": "A clinical status is required",
   "condition": "Condition",
-  "conditionDeleted": "Condition Deleted",
+  "conditionDeleted": "Condition deleted",
   "conditionNowVisible": "It is now visible on the Conditions page",
   "conditionRequired": "A condition is required",
   "conditions": "Conditions",
   "Conditions": "Conditions",
   "conditionSaved": "Condition saved successfully",
   "conditionUpdated": "Condition updated",
-  "currentStatus": "Current status",
   "dateOfOnset": "Date of onset",
   "delete": "Delete",
   "deleteCondition": "Delete condition",
@@ -23,6 +25,7 @@
   "errorCreatingCondition": "Error creating condition",
   "errorDeletingCondition": "Error deleting condition",
   "errorUpdatingCondition": "Error updating condition",
+  "inactive": "Inactive",
   "noConditionsToDisplay": "No conditions to display",
   "noResultsFor": "No results for",
   "onsetDate": "Onset date",
diff --git a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-detailed-summary.component.tsx b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-detailed-summary.component.tsx
index 971df3b36a..356ca0ce39 100644
--- a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-detailed-summary.component.tsx
+++ b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-detailed-summary.component.tsx
@@ -144,7 +144,7 @@ const ImmunizationsDetailedSummary: React.FC<ImmunizationsDetailedSummaryProps>
         <DataTable rows={paginatedImmunizations} headers={tableHeader} size={isTablet ? 'lg' : 'sm'} useZebraStyles>
           {({ rows, headers, getHeaderProps, getRowProps, getTableProps, getExpandHeaderProps }) => (
             <TableContainer>
-              <Table {...getTableProps()}>
+              <Table aria-label="immunizations summary" {...getTableProps()}>
                 <TableHead>
                   <TableRow>
                     <TableExpandHeader enableToggle {...getExpandHeaderProps()} />
diff --git a/packages/esm-patient-notes-app/src/config-schema.ts b/packages/esm-patient-notes-app/src/config-schema.ts
index 85dd5af32a..92819c6166 100644
--- a/packages/esm-patient-notes-app/src/config-schema.ts
+++ b/packages/esm-patient-notes-app/src/config-schema.ts
@@ -8,8 +8,15 @@ export const configSchema = {
     _description: 'The number of visits to load initially in the Visits Summary tab. Defaults to 5',
     _default: 5,
   },
+  diagnosisConceptClass: {
+    _type: Type.UUID,
+    _description: 'The concept class to use for the diagnoses',
+    _default: '8d4918b0-c2cc-11de-8d13-0010c6dffd0f',
+  },
 };
 
 export interface ConfigObject {
   visitNoteConfig: VisitNoteConfigObject;
+  numberOfVisitsToLoad: number;
+  diagnosisConceptClass: string;
 }
diff --git a/packages/esm-patient-notes-app/src/notes/visit-note-config-schema.ts b/packages/esm-patient-notes-app/src/notes/visit-note-config-schema.ts
index 1310aad2b7..c40042d83c 100644
--- a/packages/esm-patient-notes-app/src/notes/visit-note-config-schema.ts
+++ b/packages/esm-patient-notes-app/src/notes/visit-note-config-schema.ts
@@ -28,4 +28,5 @@ export interface VisitNoteConfigObject {
   encounterNoteTextConceptUuid: string;
   encounterTypeUuid: string;
   formConceptUuid: string;
+  visitDiagnosesConceptUuid: string;
 }
diff --git a/packages/esm-patient-notes-app/src/notes/visit-notes-form.component.tsx b/packages/esm-patient-notes-app/src/notes/visit-notes-form.component.tsx
index 4a297f5dea..413b27e977 100644
--- a/packages/esm-patient-notes-app/src/notes/visit-notes-form.component.tsx
+++ b/packages/esm-patient-notes-app/src/notes/visit-notes-form.component.tsx
@@ -1,7 +1,8 @@
 import React, { type SyntheticEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import dayjs from 'dayjs';
-import { useTranslation } from 'react-i18next';
 import debounce from 'lodash-es/debounce';
+import { useTranslation, type TFunction } from 'react-i18next';
+import { mutate } from 'swr';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm, Controller, type Control } from 'react-hook-form';
@@ -13,6 +14,7 @@ import {
   DatePickerInput,
   Form,
   FormGroup,
+  InlineNotification,
   Row,
   Search,
   SkeletonText,
@@ -20,36 +22,34 @@ import {
   Tag,
   TextArea,
   Tile,
-  Layer,
 } from '@carbon/react';
 import { Add, Edit, WarningFilled } from '@carbon/react/icons';
 import {
   type UploadedFile,
+  createAttachment,
   createErrorHandler,
   ExtensionSlot,
+  ResponsiveWrapper,
+  restBaseUrl,
   showModal,
   showSnackbar,
   useConfig,
   useLayoutType,
   useSession,
-  createAttachment,
-  restBaseUrl,
-  ResponsiveWrapper,
 } from '@openmrs/esm-framework';
 import { type DefaultWorkspaceProps } from '@openmrs/esm-patient-common-lib';
 import type { ConfigObject } from '../config-schema';
 import type { Concept, Diagnosis, DiagnosisPayload, VisitNotePayload } from '../types';
 import {
-  fetchConceptDiagnosisByName,
+  fetchDiagnosisConceptsByName,
   savePatientDiagnosis,
   saveVisitNote,
   useInfiniteVisits,
   useVisitNotes,
 } from './visit-notes.resource';
 import styles from './visit-notes-form.scss';
-import { mutate } from 'swr';
 
-const allowedImageTypes = ['jpeg', 'jpg', 'png', 'webp'];
+const allowedImageTypes = ['.jpeg', '.jpg', '.png', '.webp'];
 
 const visitNoteFormSchema = z.object({
   noteDate: z.date(),
@@ -63,13 +63,25 @@ const visitNoteFormSchema = z.object({
 
 type VisitNotesFormData = z.infer<typeof visitNoteFormSchema>;
 
+interface DiagnosesDisplayProps {
+  fieldName: string;
+  isDiagnosisNotSelected: (diagnosis: Concept) => boolean;
+  isLoading: boolean;
+  isSearching: boolean;
+  onAddDiagnosis: (diagnosis: Concept, searchInputField: string) => void;
+  searchResults: Array<Concept>;
+  t: TFunction;
+  value: string;
+}
+
 interface DiagnosisSearchProps {
-  name: 'noteDate' | 'primaryDiagnosisSearch' | 'secondaryDiagnosisSearch' | 'clinicalNote';
-  labelText: string;
-  placeholder: string;
   control: Control<VisitNotesFormData>;
-  handleSearch: (fieldName) => void;
   error?: Object;
+  handleSearch: (fieldName) => void;
+  labelText: string;
+  name: 'noteDate' | 'primaryDiagnosisSearch' | 'secondaryDiagnosisSearch' | 'clinicalNote';
+  placeholder: string;
+  setIsSearching: (isSearching: boolean) => void;
 }
 
 const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({
@@ -82,19 +94,21 @@ const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const session = useSession();
-  const config = useConfig() as ConfigObject;
+  const config = useConfig<ConfigObject>();
   const state = useMemo(() => ({ patientUuid }), [patientUuid]);
   const { clinicianEncounterRole, encounterNoteTextConceptUuid, encounterTypeUuid, formConceptUuid } =
     config.visitNoteConfig;
   const [isHandlingSubmit, setIsHandlingSubmit] = useState(false);
-  const [loadingPrimary, setLoadingPrimary] = useState<boolean>(false);
-  const [loadingSecondary, setLoadingSecondary] = useState<boolean>(false);
+  const [isLoadingPrimaryDiagnoses, setIsLoadingPrimaryDiagnoses] = useState(false);
+  const [isLoadingSecondaryDiagnoses, setIsLoadingSecondaryDiagnoses] = useState(false);
+  const [isSearching, setIsSearching] = useState(false);
   const [selectedPrimaryDiagnoses, setSelectedPrimaryDiagnoses] = useState<Array<Diagnosis>>([]);
   const [selectedSecondaryDiagnoses, setSelectedSecondaryDiagnoses] = useState<Array<Diagnosis>>([]);
-  const [searchPrimaryResults, setSearchPrimaryResults] = useState<Array<Concept>>([]);
-  const [searchSecondaryResults, setSearchSecondaryResults] = useState<Array<Concept>>([]);
+  const [searchPrimaryResults, setSearchPrimaryResults] = useState<Array<Concept>>(null);
+  const [searchSecondaryResults, setSearchSecondaryResults] = useState<Array<Concept>>(null);
   const [combinedDiagnoses, setCombinedDiagnoses] = useState<Array<Diagnosis>>([]);
   const [rows, setRows] = useState<number>();
+  const [error, setError] = useState<Error>(null);
 
   const { control, handleSubmit, watch, getValues, setValue, formState } = useForm<VisitNotesFormData>({
     mode: 'onSubmit',
@@ -124,6 +138,7 @@ const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({
     if (fieldQuery) {
       debouncedSearch(fieldQuery, fieldName);
     }
+    setIsSearching(false);
   };
 
   const debouncedSearch = useMemo(
@@ -131,25 +146,25 @@ const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({
       debounce((fieldQuery, fieldName) => {
         if (fieldQuery) {
           if (fieldName === 'primaryDiagnosisSearch') {
-            setLoadingPrimary(true);
+            setIsLoadingPrimaryDiagnoses(true);
           } else if (fieldName === 'secondaryDiagnosisSearch') {
-            setLoadingSecondary(true);
+            setIsLoadingSecondaryDiagnoses(true);
           }
-          const sub = fetchConceptDiagnosisByName(fieldQuery).subscribe(
-            (matchingConceptDiagnoses: Array<Concept>) => {
+
+          fetchDiagnosisConceptsByName(fieldQuery, config.diagnosisConceptClass)
+            .then((matchingConceptDiagnoses: Array<Concept>) => {
               if (fieldName == 'primaryDiagnosisSearch') {
                 setSearchPrimaryResults(matchingConceptDiagnoses);
-                setLoadingPrimary(false);
+                setIsLoadingPrimaryDiagnoses(false);
               } else if (fieldName == 'secondaryDiagnosisSearch') {
                 setSearchSecondaryResults(matchingConceptDiagnoses);
-                setLoadingSecondary(false);
+                setIsLoadingSecondaryDiagnoses(false);
               }
-            },
-            () => createErrorHandler(),
-          );
-          return () => {
-            sub.unsubscribe();
-          };
+            })
+            .catch((e) => {
+              setError(e);
+              createErrorHandler();
+            });
         }
       }, searchTimeoutInMs),
     [],
@@ -365,52 +380,48 @@ const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({
           </Column>
         </Row>
         <Row className={styles.row}>
+          <div className={styles.diagnosesText}>
+            {selectedPrimaryDiagnoses && selectedPrimaryDiagnoses.length ? (
+              <>
+                {selectedPrimaryDiagnoses.map((diagnosis, index) => (
+                  <Tag
+                    className={styles.tag}
+                    filter
+                    key={index}
+                    onClose={() => handleRemoveDiagnosis(diagnosis, 'primaryInputSearch')}
+                    type="red"
+                  >
+                    {diagnosis.display}
+                  </Tag>
+                ))}
+              </>
+            ) : null}
+            {selectedSecondaryDiagnoses && selectedSecondaryDiagnoses.length ? (
+              <>
+                {selectedSecondaryDiagnoses.map((diagnosis, index) => (
+                  <Tag
+                    classname={styles.tag}
+                    filter
+                    key={index}
+                    onClose={() => handleRemoveDiagnosis(diagnosis, 'secondaryInputSearch')}
+                    type="blue"
+                  >
+                    {diagnosis.display}
+                  </Tag>
+                ))}
+              </>
+            ) : null}
+            {selectedPrimaryDiagnoses &&
+              !selectedPrimaryDiagnoses.length &&
+              selectedSecondaryDiagnoses &&
+              !selectedSecondaryDiagnoses.length && (
+                <span>{t('emptyDiagnosisText', 'No diagnosis selected — Enter a diagnosis below')}</span>
+              )}
+          </div>
           <Column sm={1}>
             <span className={styles.columnLabel}>{t('primaryDiagnosis', 'Primary diagnosis')}</span>
           </Column>
           <Column sm={3}>
-            <div className={styles.diagnosesText} style={{ marginBottom: '1.188rem' }}>
-              {selectedPrimaryDiagnoses && selectedPrimaryDiagnoses.length ? (
-                <>
-                  {selectedPrimaryDiagnoses.map((diagnosis, index) => (
-                    <Tag
-                      filter
-                      key={index}
-                      onClose={() => handleRemoveDiagnosis(diagnosis, 'primaryInputSearch')}
-                      style={{ marginRight: '0.5rem' }}
-                      type={'red'}
-                    >
-                      {diagnosis.display}
-                    </Tag>
-                  ))}
-                </>
-              ) : (
-                <></>
-              )}
-              {selectedSecondaryDiagnoses && selectedSecondaryDiagnoses.length ? (
-                <>
-                  {selectedSecondaryDiagnoses.map((diagnosis, index) => (
-                    <Tag
-                      filter
-                      key={index}
-                      onClose={() => handleRemoveDiagnosis(diagnosis, 'secondaryInputSearch')}
-                      style={{ marginRight: '0.5rem' }}
-                      type={'blue'}
-                    >
-                      {diagnosis.display}
-                    </Tag>
-                  ))}
-                </>
-              ) : (
-                <></>
-              )}
-              {selectedPrimaryDiagnoses &&
-                !selectedPrimaryDiagnoses.length &&
-                selectedSecondaryDiagnoses &&
-                !selectedSecondaryDiagnoses.length && (
-                  <span>{t('emptyDiagnosisText', 'No diagnosis selected — Enter a diagnosis below')}</span>
-                )}
-            </div>
             <FormGroup legendText={t('searchForPrimaryDiagnosis', 'Search for a primary diagnosis')}>
               <DiagnosisSearch
                 name="primaryDiagnosisSearch"
@@ -419,63 +430,27 @@ const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({
                 placeholder={t('primaryDiagnosisInputPlaceholder', 'Choose a primary diagnosis')}
                 handleSearch={handleSearch}
                 error={formState?.errors?.primaryDiagnosisSearch}
+                setIsSearching={setIsSearching}
+              />
+              {error ? (
+                <InlineNotification
+                  className={styles.errorNotification}
+                  lowContrast
+                  title={t('error', 'Error')}
+                  subtitle={t('errorFetchingConcepts', 'There was a problem fetching concepts') + '.'}
+                  onClose={() => setError(null)}
+                />
+              ) : null}
+              <DiagnosesDisplay
+                fieldName={'primaryDiagnosisSearch'}
+                isDiagnosisNotSelected={isDiagnosisNotSelected}
+                isLoading={isLoadingPrimaryDiagnoses}
+                isSearching={isSearching}
+                onAddDiagnosis={handleAddDiagnosis}
+                searchResults={searchPrimaryResults}
+                t={t}
+                value={watch('primaryDiagnosisSearch')}
               />
-              <div>
-                {(() => {
-                  if (!getValues('primaryDiagnosisSearch')) return null;
-                  if (loadingPrimary)
-                    return (
-                      <>
-                        <SkeletonText className={styles.skeleton} />
-                        <SkeletonText className={styles.skeleton} />
-                        <SkeletonText className={styles.skeleton} />
-                        <SkeletonText className={styles.skeleton} />
-                        <SkeletonText className={styles.skeleton} />
-                      </>
-                    );
-                  if (!loadingPrimary && searchPrimaryResults && searchPrimaryResults.length > 0) {
-                    return (
-                      <ul className={styles.diagnosisList}>
-                        {searchPrimaryResults.map((diagnosis, index) => {
-                          if (isDiagnosisNotSelected(diagnosis)) {
-                            return (
-                              <li
-                                role="menuitem"
-                                className={styles.diagnosis}
-                                key={index}
-                                onClick={() => handleAddDiagnosis(diagnosis, 'primaryDiagnosisSearch')}
-                              >
-                                {diagnosis.display}
-                              </li>
-                            );
-                          }
-                        })}
-                      </ul>
-                    );
-                  }
-                  return (
-                    <>
-                      {isTablet ? (
-                        <Layer>
-                          <Tile className={styles.emptyResults}>
-                            <span>
-                              {t('noMatchingDiagnoses', 'No diagnoses found matching')}{' '}
-                              <strong>"{watch('primaryDiagnosisSearch')}"</strong>
-                            </span>
-                          </Tile>
-                        </Layer>
-                      ) : (
-                        <Tile className={styles.emptyResults}>
-                          <span>
-                            {t('noMatchingDiagnoses', 'No diagnoses found matching')}{' '}
-                            <strong>"{watch('primaryDiagnosisSearch')}"</strong>
-                          </span>
-                        </Tile>
-                      )}
-                    </>
-                  );
-                })()}
-              </div>
             </FormGroup>
           </Column>
         </Row>
@@ -491,51 +466,27 @@ const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({
                 labelText={t('enterSecondaryDiagnoses', 'Enter Secondary diagnoses')}
                 placeholder={t('secondaryDiagnosisInputPlaceholder', 'Choose a secondary diagnosis')}
                 handleSearch={handleSearch}
+                setIsSearching={setIsSearching}
+              />
+              {error ? (
+                <InlineNotification
+                  className={styles.errorNotification}
+                  lowContrast
+                  title={t('error', 'Error')}
+                  subtitle={t('errorFetchingConcepts', 'There was a problem fetching concepts') + '.'}
+                  onClose={() => setError(null)}
+                />
+              ) : null}
+              <DiagnosesDisplay
+                fieldName={'secondaryDiagnosisSearch'}
+                isDiagnosisNotSelected={isDiagnosisNotSelected}
+                isLoading={isLoadingSecondaryDiagnoses}
+                isSearching={isSearching}
+                onAddDiagnosis={handleAddDiagnosis}
+                searchResults={searchSecondaryResults}
+                t={t}
+                value={watch('secondaryDiagnosisSearch')}
               />
-              <div>
-                {(() => {
-                  if (!getValues('secondaryDiagnosisSearch')) return null;
-                  if (loadingSecondary)
-                    return (
-                      <>
-                        <SkeletonText className={styles.skeleton} />
-                        <SkeletonText className={styles.skeleton} />
-                        <SkeletonText className={styles.skeleton} />
-                        <SkeletonText className={styles.skeleton} />
-                        <SkeletonText className={styles.skeleton} />
-                      </>
-                    );
-                  if (!loadingSecondary && searchSecondaryResults && searchSecondaryResults.length > 0)
-                    return (
-                      <ul className={styles.diagnosisList}>
-                        {searchSecondaryResults.map((diagnosis, index) => {
-                          if (isDiagnosisNotSelected(diagnosis)) {
-                            return (
-                              <li
-                                role="menuitem"
-                                className={styles.diagnosis}
-                                key={index}
-                                onClick={() => handleAddDiagnosis(diagnosis, 'secondaryDiagnosisSearch')}
-                              >
-                                {diagnosis.display}
-                              </li>
-                            );
-                          }
-                        })}
-                      </ul>
-                    );
-                  return (
-                    <ResponsiveWrapper>
-                      <Tile className={styles.emptyResults}>
-                        <span>
-                          {t('noMatchingDiagnoses', 'No diagnoses found matching')}{' '}
-                          <strong>"{watch('secondaryDiagnosisSearch')}"</strong>
-                        </span>
-                      </Tile>
-                    </ResponsiveWrapper>
-                  );
-                })()}
-              </div>
             </FormGroup>
           </Column>
         </Row>
@@ -579,7 +530,7 @@ const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({
               </p>
               {currentImage?.base64Content ? (
                 <Button
-                  style={{ marginTop: '1rem' }}
+                  className={styles.uploadButton}
                   kind={isTablet ? 'ghost' : 'tertiary'}
                   onClick={() => showImageCaptureModal()}
                   renderIcon={(props) => <Edit size={16} {...props} />}
@@ -588,7 +539,7 @@ const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({
                 </Button>
               ) : (
                 <Button
-                  style={{ marginTop: '1rem' }}
+                  className={styles.uploadButton}
                   kind={isTablet ? 'ghost' : 'tertiary'}
                   onClick={() => showImageCaptureModal()}
                   renderIcon={(props) => <Add size={16} {...props} />}
@@ -625,7 +576,15 @@ const VisitNotesForm: React.FC<DefaultWorkspaceProps> = ({
 
 export default VisitNotesForm;
 
-function DiagnosisSearch({ name, control, labelText, placeholder, handleSearch, error }: DiagnosisSearchProps) {
+function DiagnosisSearch({
+  name,
+  control,
+  labelText,
+  placeholder,
+  handleSearch,
+  error,
+  setIsSearching,
+}: DiagnosisSearchProps) {
   const isTablet = useLayoutType() === 'tablet';
   const inputRef = useRef(null);
 
@@ -655,6 +614,7 @@ function DiagnosisSearch({ name, control, labelText, placeholder, handleSearch,
               placeholder={placeholder}
               renderIcon={error && ((props) => <WarningFilled fill="red" {...props} />)}
               onChange={(e) => {
+                setIsSearching(true);
                 onChange(e);
                 handleSearch(name);
               }}
@@ -668,3 +628,67 @@ function DiagnosisSearch({ name, control, labelText, placeholder, handleSearch,
     />
   );
 }
+
+function DiagnosesDisplay({
+  fieldName,
+  isDiagnosisNotSelected,
+  isLoading,
+  isSearching,
+  onAddDiagnosis,
+  searchResults,
+  t,
+  value,
+}: DiagnosesDisplayProps) {
+  if (!value) {
+    return null;
+  }
+
+  if (isSearching || isLoading) {
+    return <Loader />;
+  }
+
+  if (!isSearching && searchResults?.length > 0) {
+    return (
+      <ul className={styles.diagnosisList}>
+        {searchResults.map((diagnosis, index) => {
+          if (isDiagnosisNotSelected(diagnosis)) {
+            return (
+              <li
+                className={styles.diagnosis}
+                key={index}
+                onClick={() => onAddDiagnosis(diagnosis, fieldName)}
+                role="menuitem"
+              >
+                {diagnosis.display}
+              </li>
+            );
+          }
+        })}
+      </ul>
+    );
+  }
+
+  if (searchResults?.length === 0) {
+    return (
+      <ResponsiveWrapper>
+        <Tile className={styles.emptyResults}>
+          <span>
+            {t('noMatchingDiagnoses', 'No diagnoses found matching')} <strong>"{value}"</strong>
+          </span>
+        </Tile>
+      </ResponsiveWrapper>
+    );
+  }
+}
+
+function Loader() {
+  return (
+    <>
+      <SkeletonText className={styles.skeleton} />
+      <SkeletonText className={styles.skeleton} />
+      <SkeletonText className={styles.skeleton} />
+      <SkeletonText className={styles.skeleton} />
+      <SkeletonText className={styles.skeleton} />
+    </>
+  );
+}
diff --git a/packages/esm-patient-notes-app/src/notes/visit-notes-form.scss b/packages/esm-patient-notes-app/src/notes/visit-notes-form.scss
index ededd9074c..90b82bbf52 100644
--- a/packages/esm-patient-notes-app/src/notes/visit-notes-form.scss
+++ b/packages/esm-patient-notes-app/src/notes/visit-notes-form.scss
@@ -14,12 +14,20 @@
 
 .diagnosis {
   padding: 0.75rem;
+  border-top: 0.0625rem solid $grey-2;
+}
+
+.diagnosis:first-of-type {
+  border-top: none;
+}
+
+.diagnosis:last-of-type {
+  border-bottom: none;
 }
 
 .diagnosisList {
-  margin-top: 0.25rem;
   background-color: $ui-02;
-  max-height: 14rem;
+  max-height: 13.5rem;
   overflow-y: auto;
   border: 1px solid $ui-03;
 }
@@ -31,11 +39,11 @@
 .diagnosesText {
   @include type.type-style("body-compact-01");
   color: $text-02;
+  margin-bottom: 1rem;
 }
 
 .emptyResults {
   @include type.type-style("body-compact-01");
-  margin-top: 0.25rem;
   color: $text-02;
   min-height: 1rem;
 }
@@ -102,7 +110,7 @@
 }
 
 .row {
-  margin: 0.5rem 0rem 2.75rem;
+  margin: 0.5rem 0rem 2.5rem;
 }
 
 .skeleton {
@@ -129,7 +137,6 @@
 .errorMessage {
   @include type.type-style("label-02");
   color: $danger;
-  margin-top: 0.5rem;
 }
 
 :global(.omrs-breakpoint-lt-desktop) {
@@ -160,3 +167,16 @@
     height: 2.5rem;
   }
 }
+
+.errorNotification {
+  margin-top: 0.25rem;
+}
+
+.tag {
+  margin-right: 0.5rem;
+  margin-left: 0;
+}
+
+.uploadButton {
+  margin-top: 1rem;
+}
diff --git a/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx b/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
index 743a920fbc..797afbd8e1 100644
--- a/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
+++ b/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 import { screen, render } from '@testing-library/react';
 import { of } from 'rxjs/internal/observable/of';
 import { showSnackbar, useConfig, useSession } from '@openmrs/esm-framework';
-import { fetchConceptDiagnosisByName, saveVisitNote } from './visit-notes.resource';
+import { fetchDiagnosisConceptsByName, saveVisitNote } from './visit-notes.resource';
 import {
   ConfigMock,
   diagnosisSearchResponse,
@@ -21,7 +21,7 @@ const testProps = {
   promptBeforeClosing: jest.fn(),
 };
 
-const mockFetchConceptDiagnosisByName = fetchConceptDiagnosisByName as jest.Mock;
+const mockFetchDiagnosisConceptsByName = fetchDiagnosisConceptsByName as jest.Mock;
 const mockSaveVisitNote = saveVisitNote as jest.Mock;
 const mockedShowSnackbar = jest.mocked(showSnackbar);
 const mockUseConfig = useConfig as jest.Mock;
@@ -42,7 +42,7 @@ jest.mock('@openmrs/esm-framework', () => {
 });
 
 jest.mock('./visit-notes.resource', () => ({
-  fetchConceptDiagnosisByName: jest.fn(),
+  fetchDiagnosisConceptsByName: jest.fn(),
   useLocationUuid: jest.fn().mockImplementation(() => ({
     data: mockFetchLocationByUuidResponse.data.uuid,
   })),
@@ -59,7 +59,7 @@ jest.mock('./visit-notes.resource', () => ({
 }));
 
 test('renders the visit notes form with all the relevant fields and values', () => {
-  mockFetchConceptDiagnosisByName.mockReturnValue(of([]));
+  mockFetchDiagnosisConceptsByName.mockResolvedValue([]);
 
   renderVisitNotesForm();
 
@@ -74,7 +74,7 @@ test('renders the visit notes form with all the relevant fields and values', ()
 });
 
 test.only('typing in the diagnosis search input triggers a search', async () => {
-  mockFetchConceptDiagnosisByName.mockReturnValue(of(diagnosisSearchResponse.results));
+  mockFetchDiagnosisConceptsByName.mockResolvedValue(diagnosisSearchResponse.results);
 
   renderVisitNotesForm();
 
@@ -99,7 +99,7 @@ test.only('typing in the diagnosis search input triggers a search', async () =>
 
 test('renders an error message when no matching diagnoses are found', async () => {
   const user = userEvent.setup();
-  mockFetchConceptDiagnosisByName.mockReturnValue(of([]));
+  mockFetchDiagnosisConceptsByName.mockResolvedValue([]);
 
   renderVisitNotesForm();
 
@@ -139,7 +139,7 @@ test('renders a success snackbar upon successfully recording a visit note', asyn
   };
 
   mockSaveVisitNote.mockResolvedValueOnce({ status: 201, body: 'Condition created' });
-  mockFetchConceptDiagnosisByName.mockReturnValue(of(diagnosisSearchResponse.results));
+  mockFetchDiagnosisConceptsByName.mockResolvedValue(diagnosisSearchResponse.results);
 
   renderVisitNotesForm();
 
@@ -173,7 +173,7 @@ test('renders an error snackbar if there was a problem recording a condition', a
   };
 
   mockSaveVisitNote.mockRejectedValueOnce(error);
-  mockFetchConceptDiagnosisByName.mockReturnValue(of(diagnosisSearchResponse.results));
+  mockFetchDiagnosisConceptsByName.mockResolvedValue(diagnosisSearchResponse.results);
 
   renderVisitNotesForm();
 
diff --git a/packages/esm-patient-notes-app/src/notes/visit-notes.resource.ts b/packages/esm-patient-notes-app/src/notes/visit-notes.resource.ts
index d4d4b77dfb..89acf8d19f 100644
--- a/packages/esm-patient-notes-app/src/notes/visit-notes.resource.ts
+++ b/packages/esm-patient-notes-app/src/notes/visit-notes.resource.ts
@@ -1,14 +1,14 @@
 import useSWR from 'swr';
 import useSWRInfinite from 'swr/infinite';
-import { map } from 'rxjs/operators';
-import { openmrsFetch, openmrsObservableFetch, restBaseUrl, useConfig } from '@openmrs/esm-framework';
-import {
-  type EncountersFetchResponse,
-  type RESTPatientNote,
-  type PatientNote,
-  type VisitNotePayload,
-  type DiagnosisPayload,
-  type Concept,
+import { openmrsFetch, restBaseUrl, useConfig } from '@openmrs/esm-framework';
+import { type ConfigObject } from '../config-schema';
+import type {
+  Concept,
+  DiagnosisPayload,
+  EncountersFetchResponse,
+  PatientNote,
+  RESTPatientNote,
+  VisitNotePayload,
 } from '../types';
 
 interface UseVisitNotes {
@@ -22,7 +22,7 @@ interface UseVisitNotes {
 export function useVisitNotes(patientUuid: string): UseVisitNotes {
   const {
     visitNoteConfig: { encounterNoteTextConceptUuid, visitDiagnosesConceptUuid },
-  } = useConfig();
+  } = useConfig<ConfigObject>();
 
   const customRepresentation =
     'custom:(uuid,display,encounterDatetime,patient,obs,' +
@@ -103,10 +103,11 @@ export function useInfiniteVisits(patientUuid: string) {
   };
 }
 
-export function fetchConceptDiagnosisByName(searchTerm: string) {
-  return openmrsObservableFetch<Array<Concept>>(
-    `${restBaseUrl}/concept?q=${searchTerm}&searchType=fuzzy&class=8d4918b0-c2cc-11de-8d13-0010c6dffd0f&q=&v=custom:(uuid,display)`,
-  ).pipe(map(({ data }) => data['results']));
+export function fetchDiagnosisConceptsByName(searchTerm: string, diagnosisConceptClass: string) {
+  const customRepresentation = 'custom:(uuid,display)';
+  const url = `${restBaseUrl}/concept?name=${searchTerm}&searchType=fuzzy&class=${diagnosisConceptClass}&v=${customRepresentation}`;
+
+  return openmrsFetch<Array<Concept>>(url).then(({ data }) => Promise.resolve(data['results']));
 }
 
 export function saveVisitNote(abortController: AbortController, payload: VisitNotePayload) {
diff --git a/packages/esm-patient-notes-app/translations/en.json b/packages/esm-patient-notes-app/translations/en.json
index 4cc0e3aa45..5668cf86cb 100644
--- a/packages/esm-patient-notes-app/translations/en.json
+++ b/packages/esm-patient-notes-app/translations/en.json
@@ -11,6 +11,8 @@
   "emptyDiagnosisText": "No diagnosis selected — Enter a diagnosis below",
   "enterPrimaryDiagnoses": "Enter Primary diagnoses",
   "enterSecondaryDiagnoses": "Enter Secondary diagnoses",
+  "error": "Error",
+  "errorFetchingConcepts": "There was a problem fetching concepts",
   "image": "Image",
   "imageUploadHelperText": "Upload an image or use this device's camera to capture an image",
   "noMatchingDiagnoses": "No diagnoses found matching",
diff --git a/packages/esm-patient-vitals-app/src/vitals/paginated-vitals.component.tsx b/packages/esm-patient-vitals-app/src/vitals/paginated-vitals.component.tsx
index 9731224c4c..9ca8517088 100644
--- a/packages/esm-patient-vitals-app/src/vitals/paginated-vitals.component.tsx
+++ b/packages/esm-patient-vitals-app/src/vitals/paginated-vitals.component.tsx
@@ -89,8 +89,8 @@ const PaginatedVitals: React.FC<PaginatedVitalsProps> = ({
                 {rows.map((row) => (
                   <TableRow key={row.id}>
                     {row.cells.map((cell) => {
-                      const vitalSignInterpretation =
-                        paginatedVitals[row.id] && paginatedVitals[row.id][cell.id.substring(2) + 'Interpretation'];
+                      const vitalsObj = paginatedVitals.find((obj) => obj.id === row.id);
+                      const vitalSignInterpretation = vitalsObj && vitalsObj[cell.id.substring(2) + 'Interpretation'];
 
                       return (
                         <StyledTableCell key={`styled-cell-${cell.id}`} interpretation={vitalSignInterpretation}>
diff --git a/yarn.lock b/yarn.lock
index 98dd65e992..e7e4772be1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4085,9 +4085,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openmrs/esm-api@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-api@npm:5.4.1-pre.1629"
+"@openmrs/esm-api@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-api@npm:5.5.1-pre.1659"
   dependencies:
     "@types/fhir": "npm:0.0.31"
     lodash-es: "npm:^4.17.21"
@@ -4096,17 +4096,17 @@ __metadata:
     "@openmrs/esm-error-handling": 5.x
     "@openmrs/esm-navigation": 5.x
     "@openmrs/esm-offline": 5.x
-  checksum: 10/57074dc6eca4d5bfae70f968ce6818fada3c7e9583cc2983e0b20f0eead498ecc4e94562df1714554fa08dee5057d960da886c295ef0e419160cb40f95aa407f
+  checksum: 10/0af8110267a3a5d2a7ee89da22ec27633ecb50144c445f4076ef9b02c5d8d9e64972920a51bb80dd801ee22170aab052c83dd1888e8d759c0201080097eca367
   languageName: node
   linkType: hard
 
-"@openmrs/esm-app-shell@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-app-shell@npm:5.4.1-pre.1629"
+"@openmrs/esm-app-shell@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-app-shell@npm:5.5.1-pre.1659"
   dependencies:
     "@carbon/react": "npm:~1.37.0"
-    "@openmrs/esm-framework": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-styleguide": "npm:5.4.1-pre.1629"
+    "@openmrs/esm-framework": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-styleguide": "npm:5.5.1-pre.1659"
     dayjs: "npm:^1.10.4"
     dexie: "npm:^3.0.3"
     html-webpack-plugin: "npm:^5.5.0"
@@ -4131,44 +4131,44 @@ __metadata:
     workbox-strategies: "npm:^6.1.5"
     workbox-webpack-plugin: "npm:^6.1.5"
     workbox-window: "npm:^6.1.5"
-  checksum: 10/ecf06bfbbacdf69d8df4e36c4370621031b48f77ed22d955f66b9e607b75bb3660ba917936f655fa628b47ddd6e59efbda7225f3f0a80503a69004fc745a1cd0
+  checksum: 10/5bfc605b2c7cd440480f11c84dce5e40a5fb92bf6d9598ca5d21506174079e63d0ee1fe5e5b83b39ba4fb0fae5bd9196b632b432ccaa83e26640be99d757576c
   languageName: node
   linkType: hard
 
-"@openmrs/esm-config@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-config@npm:5.4.1-pre.1629"
+"@openmrs/esm-config@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-config@npm:5.5.1-pre.1659"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 10/125525423f75ddc848b7ced9196deef6bac6d2917c84ce378794c20efa305801f0a3aaa7fbc086665ce179b3a6e5ca0673b0d00335c81324aa7fb5b027efb202
+  checksum: 10/6127687f66e589e6a97c9ff199ed22e7dc8defc4c44668b64e3bb23d1a309fc4326c830a6595e2c511958002e8069c77af4578d7e7f8a381ba9df0e9452c8725
   languageName: node
   linkType: hard
 
-"@openmrs/esm-dynamic-loading@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-dynamic-loading@npm:5.4.1-pre.1629"
+"@openmrs/esm-dynamic-loading@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-dynamic-loading@npm:5.5.1-pre.1659"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 10/870f76eaee780a395758915357acf2a4d89f0afd619aeabdd65c1037b3c48e0dd04f24005251c60035bdffc943a38e26d9c9741606aad3c89ea55edda5c67cbc
+  checksum: 10/87d0e93df3c99f7dca006741ca7081a61340b429be9a1297297811c55337b6f64c5c12c5f804b3b7c31859af28248fbb0743a12dfbc4ecba9f48644541617e94
   languageName: node
   linkType: hard
 
-"@openmrs/esm-error-handling@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-error-handling@npm:5.4.1-pre.1629"
+"@openmrs/esm-error-handling@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-error-handling@npm:5.5.1-pre.1659"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 10/b8e668a4ae813e0b10dfc025e6c4a576164dab4d55f698d215812537e6a1e8e379841707692c9150d762192c0b9ff371b059400a7fe1336b296d1868d7a174bc
+  checksum: 10/c66f1b9ff4a5e4a1feda813f7c5b1bb383b4288e1596e14eb386214ae5db4608ef98978f883fb32dae5be270249f8c9d2ac576d7606b1e3f6d44533b6f3ca569
   languageName: node
   linkType: hard
 
-"@openmrs/esm-extensions@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-extensions@npm:5.4.1-pre.1629"
+"@openmrs/esm-extensions@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-extensions@npm:5.5.1-pre.1659"
   dependencies:
     lodash-es: "npm:^4.17.21"
   peerDependencies:
@@ -4177,20 +4177,20 @@ __metadata:
     "@openmrs/esm-feature-flags": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 10/fe0c3e73febf8f20d5106da20a85a224a613a803414fe437b70fe9b655f55d9d4cd7c81a73655b779659775ed005785a380efaa90848ec2e95c9e9b2a08dd13c
+  checksum: 10/e8d2acd846cc8e73e33439b3e48673b74f44cd006a20f4193cfb3eb35d0d32a556bb949e119657e6096814d40bab7216428978bfdafc29bd7a529a50831152ee
   languageName: node
   linkType: hard
 
-"@openmrs/esm-feature-flags@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-feature-flags@npm:5.4.1-pre.1629"
+"@openmrs/esm-feature-flags@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-feature-flags@npm:5.5.1-pre.1659"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 10/893838ed5fbf636fafd22d4a823b1e35637737b8f1e2d0ce6b61f37388c28a4a778fc3d2c7c7912fe01bc96ca87316b781c559feb19ee7e9613e551f02bd6b9d
+  checksum: 10/0001928309f6295c6d36ab2f3b353e4f3240fa868880343e3df4134d2bd3d2f3aecc9743245f4eb82d7733e0a60087991be4f803af8972ce0033821e1078ce04
   languageName: node
   linkType: hard
 
@@ -4284,35 +4284,36 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-framework@npm:5.4.1-pre.1629, @openmrs/esm-framework@npm:next":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-framework@npm:5.4.1-pre.1629"
-  dependencies:
-    "@openmrs/esm-api": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-config": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-dynamic-loading": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-error-handling": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-extensions": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-feature-flags": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-globals": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-navigation": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-offline": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-react-utils": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-routes": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-state": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-styleguide": "npm:5.4.1-pre.1629"
-    "@openmrs/esm-utils": "npm:5.4.1-pre.1629"
+"@openmrs/esm-framework@npm:5.5.1-pre.1659, @openmrs/esm-framework@npm:next":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-framework@npm:5.5.1-pre.1659"
+  dependencies:
+    "@openmrs/esm-api": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-config": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-dynamic-loading": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-error-handling": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-extensions": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-feature-flags": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-globals": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-navigation": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-offline": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-react-utils": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-routes": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-state": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-styleguide": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-translations": "npm:5.5.1-pre.1659"
+    "@openmrs/esm-utils": "npm:5.5.1-pre.1659"
     dayjs: "npm:^1.10.7"
   peerDependencies:
     dayjs: 1.x
-    i18next: 19.x
+    i18next: 21.x
     react: 18.x
     react-dom: 18.x
     react-i18next: 11.x
     rxjs: 6.x
     single-spa: 5.x
     swr: 2.x
-  checksum: 10/9ced31ff40e12c3ff9f68ecf5d8f5e01e1961d920145c078b89c023becee70ea298aa2e8043769207cf32586f3a11a51acc0fa37cce8befcdf2a379c071529c5
+  checksum: 10/b446dd014175b6745a5fff7f19c3d02f91fa8a67dd81c74324917b40b36870f4bbb1d441e5a96108ba5a11fb155a8b638d06a9047dcd00871059e0dfca58caa1
   languageName: node
   linkType: hard
 
@@ -4338,29 +4339,29 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-globals@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-globals@npm:5.4.1-pre.1629"
+"@openmrs/esm-globals@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-globals@npm:5.5.1-pre.1659"
   peerDependencies:
     single-spa: 5.x
-  checksum: 10/0fd20023762a34e1ee86819f1d5e812872e350be87e90d0d6f28842eed6ca52f74c8582ab6c689be8e1fb86bf50fc2c45a4d5b3d1a038bf5fa169c800c2b5204
+  checksum: 10/8ef872166e4693d951097e29c1d7211353472860270f70d613e3cd64005200f20a8f3b2df44392e42ed388bfdc3f545da4f117a42b94c3af7ae1ec527a234e15
   languageName: node
   linkType: hard
 
-"@openmrs/esm-navigation@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-navigation@npm:5.4.1-pre.1629"
+"@openmrs/esm-navigation@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-navigation@npm:5.5.1-pre.1659"
   dependencies:
     path-to-regexp: "npm:6.1.0"
   peerDependencies:
     "@openmrs/esm-state": 5.x
-  checksum: 10/801895405ccaedc5d3c3d8b36f9c8a7bb816443840a1c68dde8b92f3e4dae27a24f6f52db4efe7ff7d10155847104d6fac307cca51bdb7ed9616627937d1e262
+  checksum: 10/d510dd308ce4617a1b28afb4f189fcd4ca3a5b1a8f950c80a77cf3a021c742d0323e44487e2453c50b72e193f05e7f175494b4f7190381fbe9bf22c7274357db
   languageName: node
   linkType: hard
 
-"@openmrs/esm-offline@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-offline@npm:5.4.1-pre.1629"
+"@openmrs/esm-offline@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-offline@npm:5.5.1-pre.1659"
   dependencies:
     dexie: "npm:^3.0.3"
     lodash-es: "npm:^4.17.21"
@@ -4372,7 +4373,7 @@ __metadata:
     "@openmrs/esm-state": 5.x
     "@openmrs/esm-styleguide": 5.x
     rxjs: 6.x
-  checksum: 10/f30c6ff21f0fc52b8ac0e1300d0132d8d28cf6f9c0d9f43fa0cdec3b9316eccef2b82c271db1daef7eb72f1d43244627d4cc59a7b5b9eabb549e33d78ddcb58a
+  checksum: 10/3373eb2d2750c8c582dac1c01bb3c5b03cb5bf96154707b341239b3be09faace5a9a044429a0f500d0b3c9282889b3c6b0887ee5a9030e913d50e9d28e9f1544
   languageName: node
   linkType: hard
 
@@ -4396,25 +4397,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-patient-appointments-app@workspace:packages/esm-patient-appointments-app":
-  version: 0.0.0-use.local
-  resolution: "@openmrs/esm-patient-appointments-app@workspace:packages/esm-patient-appointments-app"
-  dependencies:
-    "@openmrs/esm-patient-common-lib": "workspace:*"
-    lodash-es: "npm:^4.17.21"
-    webpack: "npm:^5.88.2"
-  peerDependencies:
-    "@openmrs/esm-framework": 5.x
-    "@openmrs/esm-patient-common-lib": 7.x
-    dayjs: 1.x
-    react: ^18.2.0
-    react-i18next: 11.x
-    react-router-dom: 6.x
-    rxjs: 6.x
-    swr: 2.x
-  languageName: unknown
-  linkType: soft
-
 "@openmrs/esm-patient-attachments-app@workspace:packages/esm-patient-attachments-app":
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-patient-attachments-app@workspace:packages/esm-patient-attachments-app"
@@ -4784,9 +4766,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-react-utils@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-react-utils@npm:5.4.1-pre.1629"
+"@openmrs/esm-react-utils@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-react-utils@npm:5.5.1-pre.1659"
   dependencies:
     lodash-es: "npm:^4.17.21"
     single-spa-react: "npm:^6.0.0"
@@ -4795,43 +4777,44 @@ __metadata:
     "@openmrs/esm-config": 5.x
     "@openmrs/esm-error-handling": 5.x
     "@openmrs/esm-extensions": 5.x
+    "@openmrs/esm-feature-flags": 5.x
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-navigation": 5.x
     dayjs: 1.x
-    i18next: 19.x
+    i18next: 21.x
     react: 18.x
     react-dom: 18.x
     react-i18next: 11.x
     rxjs: 6.x
     swr: 2.x
-  checksum: 10/1a17fad0e120081534e3aa3d77b73546ea91f26728c96a33c6dda7ffb66d2f8779140a196af87afc8c7704a3a87cb933ece296435f86a9c56045d0ce7d09bc05
+  checksum: 10/aba9c8b9214eacf877cdea231c468d6a0cf1304778bd45565f3447708fae0f032aaeb510338e765bf5ca2b52ed4dc5a5529c454a2c4a8ab8101e017d66193072
   languageName: node
   linkType: hard
 
-"@openmrs/esm-routes@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-routes@npm:5.4.1-pre.1629"
+"@openmrs/esm-routes@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-routes@npm:5.5.1-pre.1659"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-utils": 5.x
-  checksum: 10/5955c3689e4cc02059e7125bc3a5a6bc078ee1015b2b86e12007aff345234aa56b1a2b339f549248caa378f0c7b693a7dd77c63cf9f7739c25756b713916c36b
+  checksum: 10/1e9b76b4bb8de86d4e348ea4b73f5a2cea354f4c62dc256b515139874a1e108684fae00b24415a50a7bb11ef6d3d51490a4ea1e20e3aff3b824ac403e21b194d
   languageName: node
   linkType: hard
 
-"@openmrs/esm-state@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-state@npm:5.4.1-pre.1629"
+"@openmrs/esm-state@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-state@npm:5.5.1-pre.1659"
   dependencies:
     zustand: "npm:^4.3.6"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 10/bbcd0cac91bab59f953dcec3de83f7b2efd06c659d50977d409dfbd33382ea7ba35aa6717b4600f168c340b0bd3e641eb493f8bda780b8a5853b6eea29c9b199
+  checksum: 10/4beac06b7fb0506d27eeb80c26fce8c5a133a3f794d12d0a5eabd448efccf49c291a56a7e56338e5602d96405904ee439fd45666d16b24849dbfc16b16e3bae5
   languageName: node
   linkType: hard
 
-"@openmrs/esm-styleguide@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-styleguide@npm:5.4.1-pre.1629"
+"@openmrs/esm-styleguide@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-styleguide@npm:5.5.1-pre.1659"
   dependencies:
     "@carbon/charts": "npm:^1.12.0"
     "@carbon/react": "npm:~1.37.0"
@@ -4846,27 +4829,39 @@ __metadata:
     react-avatar: "npm:^5.0.3"
   peerDependencies:
     "@openmrs/esm-extensions": 5.x
-    "@openmrs/esm-framework": 5.x
     "@openmrs/esm-react-utils": 5.x
     "@openmrs/esm-state": 5.x
+    "@openmrs/esm-translations": 5.x
     dayjs: 1.x
+    i18next: 21.x
     react: 18.x
     react-dom: 18.x
     rxjs: 6.x
-  checksum: 10/773cbf18033072e237e003c1bb8c43ef9523c1738715482353ed5e27fc4104c321be4b6490314c4a4084a939b46fb37b55d71aad9047f71f66d1e6c4d26673db
+  checksum: 10/7e3adc329322ac842513bd4bec77cb71e67b1ecd9b25f96b2f946f91eee9dcd7fc93e1937483f405e5588a87ab3e29b8c8b67f353e4f9c43538bb1624d6ba4c8
+  languageName: node
+  linkType: hard
+
+"@openmrs/esm-translations@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-translations@npm:5.5.1-pre.1659"
+  dependencies:
+    i18next: "npm:21.10.0"
+  peerDependencies:
+    i18next: 21.x
+  checksum: 10/5790c273f7815bbc0cd54041bc9cc97c6d17b88e0dd23ec84dfc634d064111f03e873ca72e9af54f9cc4280a93676359043c8fb78281a54b55300c18a5c4e019
   languageName: node
   linkType: hard
 
-"@openmrs/esm-utils@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/esm-utils@npm:5.4.1-pre.1629"
+"@openmrs/esm-utils@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/esm-utils@npm:5.5.1-pre.1659"
   dependencies:
     semver: "npm:7.3.2"
   peerDependencies:
     dayjs: 1.x
-    i18next: 19.x
+    i18next: 21.x
     rxjs: 6.x
-  checksum: 10/96dd4c44867b111ac77fa7c4fa617c2892533fe05cc540ba78e10cfaf91f8acfe214a85f45c25f4bc72c3be962114c653c85adf476cbc078d1696dc3c739b3de
+  checksum: 10/242a30887712b3984028f1950b7bd7c2d3d268b922abe39e0868677d9f9735b1d88c9808b58243a5d580241097c439149c04ce10e3862bbd3bb63bab91b6eead
   languageName: node
   linkType: hard
 
@@ -4891,8 +4886,8 @@ __metadata:
   linkType: hard
 
 "@openmrs/ngx-formentry@npm:next":
-  version: 5.0.1-pre.415
-  resolution: "@openmrs/ngx-formentry@npm:5.0.1-pre.415"
+  version: 5.0.1-pre.422
+  resolution: "@openmrs/ngx-formentry@npm:5.0.1-pre.422"
   dependencies:
     tslib: "npm:^2.3.0"
   peerDependencies:
@@ -4913,7 +4908,7 @@ __metadata:
     reflect-metadata: ^0.1.13
     shelljs: ^0.7.8
     tree-model: ^1.0.7
-  checksum: 10/a7f90b571953c27e02320362c02e5f3a5cce064908f32c1f4fff8fefb2f9211b122ab300563ebcbae63f2ff782e9085d7aeaa1ec1e00263720043375824bea56
+  checksum: 10/9d2c98a756954cbdd18164b3d962a4e617f20095cfeb3d294c0da566c2f1a367aaff18ce0cd7e809093388c2b339db6daf16ac7a7311e6d8abc0b5ff25c9fe3c
   languageName: node
   linkType: hard
 
@@ -4946,9 +4941,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openmrs/webpack-config@npm:5.4.1-pre.1629":
-  version: 5.4.1-pre.1629
-  resolution: "@openmrs/webpack-config@npm:5.4.1-pre.1629"
+"@openmrs/webpack-config@npm:5.5.1-pre.1659":
+  version: 5.5.1-pre.1659
+  resolution: "@openmrs/webpack-config@npm:5.5.1-pre.1659"
   dependencies:
     "@swc/core": "npm:^1.3.58"
     clean-webpack-plugin: "npm:^4.0.0"
@@ -4965,7 +4960,7 @@ __metadata:
     webpack-stats-plugin: "npm:^1.0.3"
   peerDependencies:
     webpack: 5.x
-  checksum: 10/9a82d5bd7f378c3e7e1ab378de6b88e5bef67acc2eb86ba5c933054a9328f17363c7037f906a0e61f71670852d6045ec72d05c26a2cdc1f308396af3fde36f3d
+  checksum: 10/c321fffdfe940e52d0105e519126d323c44b5f3527ab33630c80290b9931a32235a05d58823d042d2498199663ed71cfa483064334cf4d5e0b225032ce1c197f
   languageName: node
   linkType: hard
 
@@ -8827,7 +8822,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.0, body-parser@npm:^1.19.0":
+"body-parser@npm:1.20.2":
+  version: 1.20.2
+  resolution: "body-parser@npm:1.20.2"
+  dependencies:
+    bytes: "npm:3.1.2"
+    content-type: "npm:~1.0.5"
+    debug: "npm:2.6.9"
+    depd: "npm:2.0.0"
+    destroy: "npm:1.2.0"
+    http-errors: "npm:2.0.0"
+    iconv-lite: "npm:0.4.24"
+    on-finished: "npm:2.4.1"
+    qs: "npm:6.11.0"
+    raw-body: "npm:2.5.2"
+    type-is: "npm:~1.6.18"
+    unpipe: "npm:1.0.0"
+  checksum: 10/3cf171b82190cf91495c262b073e425fc0d9e25cc2bf4540d43f7e7bbca27d6a9eae65ca367b6ef3993eea261159d9d2ab37ce444e8979323952e12eb3df319a
+  languageName: node
+  linkType: hard
+
+"body-parser@npm:^1.19.0":
   version: 1.20.0
   resolution: "body-parser@npm:1.20.0"
   dependencies:
@@ -9937,6 +9952,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"content-type@npm:~1.0.5":
+  version: 1.0.5
+  resolution: "content-type@npm:1.0.5"
+  checksum: 10/585847d98dc7fb8035c02ae2cb76c7a9bd7b25f84c447e5ed55c45c2175e83617c8813871b4ee22f368126af6b2b167df655829007b21aa10302873ea9c62662
+  languageName: node
+  linkType: hard
+
 "convert-source-map@npm:^1.5.0, convert-source-map@npm:^1.5.1, convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0":
   version: 1.8.0
   resolution: "convert-source-map@npm:1.8.0"
@@ -9960,10 +9982,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:0.5.0":
-  version: 0.5.0
-  resolution: "cookie@npm:0.5.0"
-  checksum: 10/aae7911ddc5f444a9025fbd979ad1b5d60191011339bce48e555cb83343d0f98b865ff5c4d71fecdfb8555a5cafdc65632f6fce172f32aaf6936830a883a0380
+"cookie@npm:0.6.0":
+  version: 0.6.0
+  resolution: "cookie@npm:0.6.0"
+  checksum: 10/c1f8f2ea7d443b9331680598b0ae4e6af18a618c37606d1bbdc75bec8361cce09fe93e727059a673f2ba24467131a9fb5a4eec76bb1b149c1b3e1ccb268dc583
   languageName: node
   linkType: hard
 
@@ -12522,15 +12544,15 @@ __metadata:
   linkType: hard
 
 "express@npm:^4.17.3":
-  version: 4.18.1
-  resolution: "express@npm:4.18.1"
+  version: 4.19.2
+  resolution: "express@npm:4.19.2"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
-    body-parser: "npm:1.20.0"
+    body-parser: "npm:1.20.2"
     content-disposition: "npm:0.5.4"
     content-type: "npm:~1.0.4"
-    cookie: "npm:0.5.0"
+    cookie: "npm:0.6.0"
     cookie-signature: "npm:1.0.6"
     debug: "npm:2.6.9"
     depd: "npm:2.0.0"
@@ -12546,7 +12568,7 @@ __metadata:
     parseurl: "npm:~1.3.3"
     path-to-regexp: "npm:0.1.7"
     proxy-addr: "npm:~2.0.7"
-    qs: "npm:6.10.3"
+    qs: "npm:6.11.0"
     range-parser: "npm:~1.2.1"
     safe-buffer: "npm:5.2.1"
     send: "npm:0.18.0"
@@ -12556,7 +12578,7 @@ __metadata:
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 10/7cfc95b09419c05aa565f841511853801d20c8b9a44863fbad797c325b329e4341e58fd0464489df014b8881579ae95625785c172d27e67f474a7fdb3aaf3923
+  checksum: 10/3fcd792536f802c059789ef48db3851b87e78fba103423e524144d79af37da7952a2b8d4e1a007f423329c7377d686d9476ac42e7d9ea413b80345d495e30a3a
   languageName: node
   linkType: hard
 
@@ -12956,12 +12978,12 @@ __metadata:
   linkType: hard
 
 "follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.15.0":
-  version: 1.15.5
-  resolution: "follow-redirects@npm:1.15.5"
+  version: 1.15.6
+  resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 10/d467f13c1c6aa734599b8b369cd7a625b20081af358f6204ff515f6f4116eb440de9c4e0c49f10798eeb0df26c95dd05d5e0d9ddc5786ab1a8a8abefe92929b4
+  checksum: 10/70c7612c4cab18e546e36b991bbf8009a1a41cf85354afe04b113d1117569abf760269409cb3eb842d9f7b03d62826687086b081c566ea7b1e6613cf29030bf7
   languageName: node
   linkType: hard
 
@@ -14197,7 +14219,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"i18next@npm:^21.10.0, i18next@npm:^21.2.0":
+"i18next@npm:21.10.0, i18next@npm:^21.10.0, i18next@npm:^21.2.0":
   version: 21.10.0
   resolution: "i18next@npm:21.10.0"
   dependencies:
@@ -18237,12 +18259,12 @@ __metadata:
   linkType: hard
 
 "openmrs@npm:next":
-  version: 5.4.1-pre.1629
-  resolution: "openmrs@npm:5.4.1-pre.1629"
+  version: 5.5.1-pre.1659
+  resolution: "openmrs@npm:5.5.1-pre.1659"
   dependencies:
     "@carbon/icons-react": "npm:11.26.0"
-    "@openmrs/esm-app-shell": "npm:5.4.1-pre.1629"
-    "@openmrs/webpack-config": "npm:5.4.1-pre.1629"
+    "@openmrs/esm-app-shell": "npm:5.5.1-pre.1659"
+    "@openmrs/webpack-config": "npm:5.5.1-pre.1659"
     "@pnpm/npm-conf": "npm:^2.1.0"
     "@swc/core": "npm:^1.3.58"
     autoprefixer: "npm:^10.4.2"
@@ -18273,7 +18295,7 @@ __metadata:
     yargs: "npm:^17.6.2"
   bin:
     openmrs: ./dist/cli.js
-  checksum: 10/bdc7be3b1c0ed30305c5fc11eb58b63a08dbbca3dcb51f2ede6402afb648f0da843ca5b5ee98210cc8e50fbeeb3ef748f45a599ac6903ac42081ac9649b0b6a0
+  checksum: 10/5e9c97ede80e9d0bdbfeab9116332bd1328c9e7c465eab2d9203e638fe538d5696788e9e69542206b7ea09ae1b641d5a65d6d60371a4af1394b1f9d2a7a7367e
   languageName: node
   linkType: hard
 
@@ -19585,6 +19607,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"qs@npm:6.11.0":
+  version: 6.11.0
+  resolution: "qs@npm:6.11.0"
+  dependencies:
+    side-channel: "npm:^1.0.4"
+  checksum: 10/5a3bfea3e2f359ede1bfa5d2f0dbe54001aa55e40e27dc3e60fab814362d83a9b30758db057c2011b6f53a2d4e4e5150194b5bac45372652aecb3e3c0d4b256e
+  languageName: node
+  linkType: hard
+
 "qs@npm:~6.5.2":
   version: 6.5.3
   resolution: "qs@npm:6.5.3"
@@ -19692,6 +19723,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"raw-body@npm:2.5.2":
+  version: 2.5.2
+  resolution: "raw-body@npm:2.5.2"
+  dependencies:
+    bytes: "npm:3.1.2"
+    http-errors: "npm:2.0.0"
+    iconv-lite: "npm:0.4.24"
+    unpipe: "npm:1.0.0"
+  checksum: 10/863b5171e140546a4d99f349b720abac4410338e23df5e409cfcc3752538c9caf947ce382c89129ba976f71894bd38b5806c774edac35ebf168d02aa1ac11a95
+  languageName: node
+  linkType: hard
+
 "react-anchor-link-smooth-scroll@npm:^1.0.12":
   version: 1.0.12
   resolution: "react-anchor-link-smooth-scroll@npm:1.0.12"
@@ -23602,8 +23645,8 @@ __metadata:
   linkType: hard
 
 "webpack-dev-middleware@npm:^5.3.1":
-  version: 5.3.3
-  resolution: "webpack-dev-middleware@npm:5.3.3"
+  version: 5.3.4
+  resolution: "webpack-dev-middleware@npm:5.3.4"
   dependencies:
     colorette: "npm:^2.0.10"
     memfs: "npm:^3.4.3"
@@ -23612,7 +23655,7 @@ __metadata:
     schema-utils: "npm:^4.0.0"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: 10/31a2f7a11e58a76bdcde1eb8da310b6643844d9b442f9916f48be5b46c103f23490c393c32a9af501ce68226fbb018b811f5a956635ed60a03f9481a4bcd6c76
+  checksum: 10/3004374130f31c2910da39b80e24296009653bb11caa0b8449d962b67e003d7e73d01fbcfda9be1f1f04179f66a9c39f4caf7963df54303b430e39ba5a94f7c2
   languageName: node
   linkType: hard