diff --git a/.diagrams/architecture/announcements/states.mermaid b/.diagrams/architecture/announcements/states.mermaid
new file mode 100644
index 000000000..37963cb2a
--- /dev/null
+++ b/.diagrams/architecture/announcements/states.mermaid
@@ -0,0 +1,18 @@
+---
+config:
+  layout: elk
+  elk:
+    nodePlacementStrategy: NETWORK_SIMPLEX
+---
+flowchart TD
+    draft>draft]
+    published>published]
+    expired>expired]
+    archived>archived]
+
+    published --Save as--> published
+    expired & draft --Save as--> draft & published
+    published -.On<br>expires_on<br>date.-> expired
+    draft & published & expired --Archive--> archived
+    archived & expired -.Scheduled<br>task.-> delete[Delete after 90 days]
+    published --Unpublish--> draft
\ No newline at end of file
diff --git a/.diagrams/architecture/announcements/states.mermaid.png b/.diagrams/architecture/announcements/states.mermaid.png
new file mode 100644
index 000000000..2ab83db34
Binary files /dev/null and b/.diagrams/architecture/announcements/states.mermaid.png differ
diff --git a/.diagrams/architecture/announcements/user-actions.mermaid b/.diagrams/architecture/announcements/user-actions.mermaid
new file mode 100644
index 000000000..b73281c8c
--- /dev/null
+++ b/.diagrams/architecture/announcements/user-actions.mermaid
@@ -0,0 +1,42 @@
+flowchart TD
+    start([Admin User])
+
+    %% Nodes - Actions
+    active[Publicly available]
+    email[Send email 14 days before expire_on date]
+    scheduleExpire[Automatically expire announcement after expire_on date]
+    scheduleDelete[Automatically delete announcement after 90 days]
+
+    %% Nodes - decisions
+    choice{Actions}
+    saveAny{Save As}
+    saveP{Save As}
+
+    %% Nodes - Data objects
+    draft>fa:fa-file Draft Announcement]
+    published>fa:fa-file Published Announcement]
+    expired>fa:fa-file Expired Announcement]
+    archive>fa:fa-file Archived Announcement]
+
+    %% New workflow
+    start --> choice
+    choice --New--> saveAny
+
+    %% Existing workflows
+    choice --Edit draft/expired--> saveAny
+    choice --Edit published--> saveP
+    choice --Unpublish--> draft
+    published -.Scheduled task.-> email
+
+    %% Saving workflow
+    saveAny --Draft--> draft
+    saveAny & saveP --Publish--> published
+    published -.After active_on date.-> active
+    
+    %% Expire workflows
+    published -.Scheduled task.-> scheduleExpire
+    scheduleExpire --> expired
+
+    %% Delete workflows
+    choice --Archive--> archive
+    expired & archive -.Scheduled task.-> scheduleDelete
\ No newline at end of file
diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
index b854ed7be..cdf5c92ea 100644
--- a/.github/workflows/.deploy.yml
+++ b/.github/workflows/.deploy.yml
@@ -152,9 +152,7 @@ jobs:
           --set-string global.secrets.s3Endpoint="${{secrets.S3_ENDPOINT }}" \
           --set-string global.secrets.s3Bucket="${{secrets.S3_BUCKET }}" \
           --set-string global.secrets.powerBiAnalyticsWorkspaceId="${{secrets.POWERBI_ANALYTICS_WORKSPACE_ID }}" \
-          --set-string global.secrets.powerBiAnalyticsSubmissionAnalyticsId="${{secrets.POWERBI_ANALYTICS_SUBMISSIONANALYTICS_ID }}" \
-          --set-string global.secrets.powerBiAnalyticsUserBehaviourId="${{secrets.POWERBI_ANALYTICS_USERBEHAVIOUR_ID }}" \
-          --set-string global.secrets.powerBiAnalyticsDataAnalyticsId="${{secrets.POWERBI_ANALYTICS_DATAANALYTICS_ID }}" \
+          --set-string global.secrets.powerBiAnalyticsReportId="${{secrets.POWERBI_ANALYTICS_REPORT_ID }}" \
           --set-string global.serverAdminFrontend="${{ inputs.admin-frontend-url }}" \
           --set-string global.serverFrontend="${{ inputs.frontend-url }}" \
           --set-string crunchy.pgBackRest.s3.bucket="${{ secrets.S3_BUCKET }}"  \
diff --git a/admin-frontend/src/components/AnalyticsPage.vue b/admin-frontend/src/components/AnalyticsPage.vue
index 66c54f541..177ac3442 100644
--- a/admin-frontend/src/components/AnalyticsPage.vue
+++ b/admin-frontend/src/components/AnalyticsPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isAnalyticsAvailable">
+  <div v-if="isAnalyticsAvailable" class="w-100 overflow-x-auto">
     <div
       v-for="[name, details] in resourceDetails"
       :key="name"
@@ -20,10 +20,11 @@
 import { PowerBIReportEmbed } from 'powerbi-client-vue-js';
 import { EventHandler } from 'powerbi-client-vue-js/dist/types/src/utils/utils';
 import { models, IReportEmbedConfiguration, Report } from 'powerbi-client';
-import { reactive, CSSProperties } from 'vue';
+import { reactive, CSSProperties, Reactive } from 'vue';
 import ApiService from '../services/apiService';
 import { ZonedDateTime, Duration } from '@js-joda/core';
 import { POWERBI_RESOURCE } from '../utils/constant';
+import { NotificationService } from '../services/notificationService';
 
 type PowerBiDetails = {
   config: IReportEmbedConfiguration;
@@ -36,9 +37,7 @@ const isAnalyticsAvailable =
   (window as any).config?.IS_ADMIN_ANALYTICS_AVAILABLE?.toUpperCase() == 'TRUE';
 
 const resourceDetails = createDefaultPowerBiDetailsMap([
-  POWERBI_RESOURCE.SUBMISSIONANALYTICS,
-  POWERBI_RESOURCE.USERBEHAVIOUR,
-  POWERBI_RESOURCE.DATAANALYTICS,
+  POWERBI_RESOURCE.ANALYTICS,
 ]);
 
 if (isAnalyticsAvailable) {
@@ -46,7 +45,9 @@ if (isAnalyticsAvailable) {
 }
 
 /** Create a Map containing the details of the resources. */
-function createDefaultPowerBiDetailsMap(resourcesToLoad: POWERBI_RESOURCE[]) {
+function createDefaultPowerBiDetailsMap(
+  resourcesToLoad: POWERBI_RESOURCE[],
+): Reactive<Map<POWERBI_RESOURCE, PowerBiDetails>> {
   const resourceDetails = reactive(new Map<POWERBI_RESOURCE, PowerBiDetails>());
 
   for (const name of resourcesToLoad) {
@@ -97,10 +98,21 @@ function createDefaultPowerBiDetailsMap(resourcesToLoad: POWERBI_RESOURCE[]) {
  * Get the embed config from the service.
  * Auto refresh the token before it expires.
  */
-async function getPowerBiAccessToken(resourceDetails) {
-  const embedInfo = await ApiService.getPowerBiEmbedAnalytics(
-    Array.from(resourceDetails.keys()),
-  );
+async function getPowerBiAccessToken(
+  resourceDetails: Reactive<Map<POWERBI_RESOURCE, PowerBiDetails>>,
+) {
+  let embedInfo;
+  try {
+    embedInfo = await ApiService.getPowerBiEmbedAnalytics(
+      Array.from(resourceDetails.keys()),
+    );
+  } catch (err) {
+    NotificationService.pushNotificationError(
+      'Analytics failed to load. Please try again later or contact the helpdesk.',
+      undefined,
+      1000 * 60 * 3,
+    );
+  }
   for (let resource of embedInfo.resources) {
     const ref = resourceDetails.get(resource.name);
     if (!ref) continue;
diff --git a/admin-frontend/src/components/announcements/AnnouncementForm.vue b/admin-frontend/src/components/announcements/AnnouncementForm.vue
index e0c95718e..b4018f392 100644
--- a/admin-frontend/src/components/announcements/AnnouncementForm.vue
+++ b/admin-frontend/src/components/announcements/AnnouncementForm.vue
@@ -94,7 +94,15 @@
                 counter
                 rows="3"
                 :error-messages="errors.description"
-              ></v-textarea>
+              >
+                <template #counter="{ max }">
+                  <span>
+                    {{ getDescriptionLength(announcementDescription) }}/{{
+                      max
+                    }}
+                  </span>
+                </template>
+              </v-textarea>
             </v-col>
             <v-col cols="12" md="12" sm="12">
               <h5 class="mb-2">Time settings</h5>
@@ -463,7 +471,7 @@ const { handleSubmit, setErrors, errors, meta, values } = useForm({
     description(value) {
       if (!value) return 'Description is required.';
 
-      if (value.length > 2000)
+      if (getDescriptionLength(value) > 2000)
         return 'Description should have a maximum of 2000 characters.';
 
       return true;
@@ -526,7 +534,7 @@ const { handleSubmit, setErrors, errors, meta, values } = useForm({
 
 const { value: announcementTitle } = useField('title');
 const { value: status } = useField<string>('status');
-const { value: announcementDescription } = useField('description');
+const { value: announcementDescription } = useField<string>('description');
 const { value: activeOn } = useField('active_on') as any;
 const { value: expiresOn } = useField('expires_on') as any;
 const { value: noExpiry } = useField('no_expiry') as any;
@@ -535,6 +543,10 @@ const { value: linkDisplayName } = useField('linkDisplayName') as any;
 const { value: fileDisplayName } = useField('fileDisplayName') as any;
 const { value: attachment } = useField('attachment') as any;
 
+const getDescriptionLength = (value: string) => {
+  return value.replace(/(\r\n|\n|\r)/g, '  ').length;
+};
+
 watch(noExpiry, () => {
   if (noExpiry.value) {
     expiresOn.value = undefined;
diff --git a/admin-frontend/src/utils/constant.js b/admin-frontend/src/utils/constant.js
index 3cf53b601..c5b065964 100644
--- a/admin-frontend/src/utils/constant.js
+++ b/admin-frontend/src/utils/constant.js
@@ -57,7 +57,5 @@ export const REPORT_STATUS = Object.freeze({
 });
 
 export const POWERBI_RESOURCE = Object.freeze({
-  SUBMISSIONANALYTICS: 'SubmissionAnalytics',
-  USERBEHAVIOUR: 'UserBehaviour',
-  DATAANALYTICS: 'DataAnalytics',
+  ANALYTICS: 'Analytics',
 });
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index d6cbb18c4..ddc929686 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -137,10 +137,7 @@ config.defaults({
     powerBiUrl: process.env.BACKEND_POWERBI_URL,
     analytics: {
       workspaceId: process.env.POWERBI_ANALYTICS_WORKSPACE_ID,
-      submissionAnalyticsId:
-        process.env.POWERBI_ANALYTICS_SUBMISSIONANALYTICS_ID,
-      userBehaviourId: process.env.POWERBI_ANALYTICS_USERBEHAVIOUR_ID,
-      dataAnalyticsId: process.env.POWERBI_ANALYTICS_DATAANALYTICS_ID,
+      analyticsId: process.env.POWERBI_ANALYTICS_REPORT_ID,
     },
   },
   s3: {
diff --git a/backend/src/schedulers/expire-announcements-scheduler.spec.ts b/backend/src/schedulers/expire-announcements-scheduler.spec.ts
index 11ff98f91..743876bf6 100644
--- a/backend/src/schedulers/expire-announcements-scheduler.spec.ts
+++ b/backend/src/schedulers/expire-announcements-scheduler.spec.ts
@@ -9,7 +9,7 @@ jest.mock('../v1/services/utils-service', () => ({
 
 const mockExpireAnnouncements = jest.fn();
 jest.mock('../v1/services/announcements-service', () => ({
-  expireAnnouncements: () => mockExpireAnnouncements(),
+  announcementService: { expireAnnouncements: () => mockExpireAnnouncements() },
 }));
 
 jest.mock('cron', () => ({
diff --git a/backend/src/schedulers/expire-announcements-scheduler.ts b/backend/src/schedulers/expire-announcements-scheduler.ts
index a35bcadb3..8bfce380c 100644
--- a/backend/src/schedulers/expire-announcements-scheduler.ts
+++ b/backend/src/schedulers/expire-announcements-scheduler.ts
@@ -1,7 +1,7 @@
 import advisoryLock from 'advisory-lock';
 import { config } from '../config';
 import { logger as log } from '../logger';
-import { expireAnnouncements } from '../v1/services/announcements-service';
+import { announcementService } from '../v1/services/announcements-service';
 import { createJob } from './create-job';
 
 const mutex = advisoryLock(config.get('server:databaseUrl'))(
@@ -14,7 +14,7 @@ export default createJob(
   crontime,
   async () => {
     log.info('Starting expireAnnounements scheduled job.');
-    await expireAnnouncements();
+    await announcementService.expireAnnouncements();
     log.info('Completed expireAnnounements scheduled job.');
   },
   mutex,
diff --git a/backend/src/v1/middlewares/validations/index.ts b/backend/src/v1/middlewares/validations/index.ts
index f61ea1880..6c0fcc5cd 100644
--- a/backend/src/v1/middlewares/validations/index.ts
+++ b/backend/src/v1/middlewares/validations/index.ts
@@ -7,7 +7,7 @@ export type UseValidateOptions = {
   schema: ZodSchema;
 };
 
-export const useValidate = ({ mode, schema }: UseValidateOptions) => {
+export const useValidate = ({ mode, schema, }: UseValidateOptions) => {
   return async (req: Request, res: Response, next: NextFunction) => {
     try {
       const data = req[mode];
@@ -15,7 +15,9 @@ export const useValidate = ({ mode, schema }: UseValidateOptions) => {
       req[mode] = results;
       next();
     } catch (error) {
-      logger.error(error);
+      const { path, method } = req;
+      const errorMessage = `${method} - ${path} - Data validation failed`;
+      logger.error(errorMessage, error);
       return next(error);
     }
   };
diff --git a/backend/src/v1/routes/admin-user-invites-routes.spec.ts b/backend/src/v1/routes/admin-user-invites-routes.spec.ts
index 8d4ca2abd..d8bca08f8 100644
--- a/backend/src/v1/routes/admin-user-invites-routes.spec.ts
+++ b/backend/src/v1/routes/admin-user-invites-routes.spec.ts
@@ -1,17 +1,21 @@
 import { faker } from '@faker-js/faker';
-import { Application } from 'express';
+import express, { Application } from 'express';
+import bodyParser from 'body-parser';
 import request from 'supertest';
 import { UserInputError } from '../types/errors';
+import routes from '../routes/admin-user-invites-routes';
 
 const mockDeleteInvite = jest.fn();
 const mockGetPendingInvites = jest.fn();
 const mockCreateInvite = jest.fn();
 const mockResendInvite = jest.fn();
 jest.mock('../services/admin-user-invites-service', () => ({
-  deleteInvite: (...args) => mockDeleteInvite(...args),
-  getPendingInvites: (...args) => mockGetPendingInvites(...args),
-  createInvite: (...args) => mockCreateInvite(...args),
-  resendInvite: (...args) => mockResendInvite(...args),
+  adminUserInvitesService: {
+    deleteInvite: (...args) => mockDeleteInvite(...args),
+    getPendingInvites: (...args) => mockGetPendingInvites(...args),
+    createInvite: (...args) => mockCreateInvite(...args),
+    resendInvite: (...args) => mockResendInvite(...args),
+  },
 }));
 
 jest.mock('../middlewares/authorization/authorize', () => ({
@@ -38,10 +42,10 @@ describe('admin-user-invites-routes', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
-    app = require('express')();
-    app.use(require('body-parser').json());
-    app.use(require('../routes/admin-user-invites-routes').default);
-    app.use((err, req, res, next) => {
+    app = express();
+    app.use(bodyParser.json());
+    app.use(routes);
+    app.use((err, req, res, _) => {
       res.status(400).send({ error: err.message });
     });
   });
diff --git a/backend/src/v1/routes/admin-user-invites-routes.ts b/backend/src/v1/routes/admin-user-invites-routes.ts
index 7ccfcb752..973a44b14 100644
--- a/backend/src/v1/routes/admin-user-invites-routes.ts
+++ b/backend/src/v1/routes/admin-user-invites-routes.ts
@@ -8,12 +8,7 @@ import {
   AddNewUserSchema,
   AddNewUserType,
 } from '../middlewares/validations/schemas';
-import {
-  createInvite,
-  deleteInvite,
-  getPendingInvites,
-  resendInvite,
-} from '../services/admin-user-invites-service';
+import { adminUserInvitesService } from '../services/admin-user-invites-service';
 import { utils } from '../services/utils-service';
 import { UserInputError } from '../types/errors';
 
@@ -22,7 +17,7 @@ router.use(authorize([PTRT_ADMIN_ROLE_NAME]));
 
 router.get('', async (req: Request, res: Response) => {
   try {
-    const invites = await getPendingInvites();
+    const invites = await adminUserInvitesService.getPendingInvites();
     return res.status(200).json(invites);
   } catch (error) {
     logger.error(error);
@@ -39,7 +34,7 @@ router.post(
       const userInfo = utils.getSessionUser(req);
       const jwtPayload = jsonwebtoken.decode(userInfo.jwt) as JwtPayload;
       const idirUserGuid = jwtPayload?.idir_user_guid;
-      await createInvite(
+      await adminUserInvitesService.createInvite(
         email.trim().toLowerCase(),
         role,
         firstName,
@@ -59,7 +54,7 @@ router.post(
 router.patch('/:id', async (req: Request, res: Response) => {
   try {
     const { id } = req.params;
-    await resendInvite(id);
+    await adminUserInvitesService.resendInvite(id);
     return res.status(200).json({ message: 'Invite resent' });
   } catch (error) {
     logger.error(error);
@@ -70,7 +65,7 @@ router.patch('/:id', async (req: Request, res: Response) => {
 router.delete('/:id', async (req: Request, res: Response) => {
   try {
     const { id } = req.params;
-    await deleteInvite(id);
+    await adminUserInvitesService.deleteInvite(id);
     return res.status(200).json({ message: 'Invite deleted' });
   } catch (error) {
     logger.error(error);
diff --git a/backend/src/v1/routes/analytic-routes.spec.ts b/backend/src/v1/routes/analytic-routes.spec.ts
index ebfbe5c14..73795433d 100644
--- a/backend/src/v1/routes/analytic-routes.spec.ts
+++ b/backend/src/v1/routes/analytic-routes.spec.ts
@@ -8,7 +8,10 @@ jest.mock('../services/analytic-service', () => {
   const actual = jest.requireActual('../services/analytic-service');
   return {
     ...actual,
-    getEmbedInfo: (...args) => mockGetEmbedInfo(...args),
+    analyticsService: {
+      ...actual.analyticsService,
+      getEmbedInfo: (...args) => mockGetEmbedInfo(...args),
+    },
   };
 });
 
@@ -23,20 +26,15 @@ describe('analytics', () => {
     mockGetEmbedInfo.mockReturnValue({});
 
     it('should return 200', async () => {
-      await request(app)
-        .get('/embed?resources[]=SubmissionAnalytics')
-        .expect(200);
-      expect(mockGetEmbedInfo).toHaveBeenCalledWith(['SubmissionAnalytics']);
+      await request(app).get('/embed?resources[]=Analytics').expect(200);
+      expect(mockGetEmbedInfo).toHaveBeenCalledWith(['Analytics']);
     });
 
     it('should allow multiple resource names', async () => {
       await request(app)
-        .get('/embed?resources[]=SubmissionAnalytics&resources[]=DataAnalytics')
+        .get('/embed?resources[]=Analytics&resources[]=Analytics')
         .expect(200);
-      expect(mockGetEmbedInfo).toHaveBeenCalledWith([
-        'SubmissionAnalytics',
-        'DataAnalytics',
-      ]);
+      expect(mockGetEmbedInfo).toHaveBeenCalledWith(['Analytics', 'Analytics']);
     });
 
     it('should return 500 if invalid resource name provided', async () => {
diff --git a/backend/src/v1/routes/analytic-routes.ts b/backend/src/v1/routes/analytic-routes.ts
index 65bab9886..365edf6d0 100644
--- a/backend/src/v1/routes/analytic-routes.ts
+++ b/backend/src/v1/routes/analytic-routes.ts
@@ -1,6 +1,6 @@
 import { Router, Request, Response } from 'express';
 import {
-  getEmbedInfo,
+  analyticsService,
   PowerBiResourceName,
 } from '../services/analytic-service';
 import { utils } from '../services/utils-service';
@@ -23,7 +23,7 @@ router.get(
       req: Request<undefined, undefined, undefined, EmbedQueryType>,
       res: Response,
     ) => {
-      const info = await getEmbedInfo(req.query.resources);
+      const info = await analyticsService.getEmbedInfo(req.query.resources);
 
       return res.status(200).json(info);
     },
diff --git a/backend/src/v1/routes/announcement-routes.spec.ts b/backend/src/v1/routes/announcement-routes.spec.ts
index a02861613..465813bfc 100644
--- a/backend/src/v1/routes/announcement-routes.spec.ts
+++ b/backend/src/v1/routes/announcement-routes.spec.ts
@@ -16,13 +16,15 @@ const mockCreateAnnouncement = jest.fn();
 const mockUpdateAnnouncement = jest.fn();
 const mockGetAnnouncementById = jest.fn();
 jest.mock('../services/announcements-service', () => ({
-  getAnnouncements: (...args) => {
-    return mockGetAnnouncements(...args);
+  announcementService: {
+    getAnnouncements: (...args) => {
+      return mockGetAnnouncements(...args);
+    },
+    patchAnnouncements: (...args) => mockPatchAnnouncements(...args),
+    createAnnouncement: (...args) => mockCreateAnnouncement(...args),
+    updateAnnouncement: (...args) => mockUpdateAnnouncement(...args),
+    getAnnouncementById: (...args) => mockGetAnnouncementById(...args),
   },
-  patchAnnouncements: (...args) => mockPatchAnnouncements(...args),
-  createAnnouncement: (...args) => mockCreateAnnouncement(...args),
-  updateAnnouncement: (...args) => mockUpdateAnnouncement(...args),
-  getAnnouncementById: (...args) => mockGetAnnouncementById(...args),
 }));
 
 const mockAuthenticateAdmin = jest.fn();
diff --git a/backend/src/v1/routes/announcement-routes.ts b/backend/src/v1/routes/announcement-routes.ts
index 7b692597a..e747baf74 100644
--- a/backend/src/v1/routes/announcement-routes.ts
+++ b/backend/src/v1/routes/announcement-routes.ts
@@ -7,13 +7,7 @@ import { authenticateAdmin } from '../middlewares/authorization/authenticate-adm
 import { authorize } from '../middlewares/authorization/authorize';
 import { useUpload } from '../middlewares/storage/upload';
 import { useValidate } from '../middlewares/validations';
-import {
-  createAnnouncement,
-  getAnnouncementById,
-  getAnnouncements,
-  patchAnnouncements,
-  updateAnnouncement,
-} from '../services/announcements-service';
+import { announcementService } from '../services/announcements-service';
 import { ExtendedRequest } from '../types';
 import {
   AnnouncementDataSchema,
@@ -66,7 +60,7 @@ router.get(
     try {
       // Query parameters are validated
       const query: AnnouncementQueryType = req.query;
-      const announcements = await getAnnouncements(query);
+      const announcements = await announcementService.getAnnouncements(query);
       res.status(200).json(announcements);
     } catch (error) {
       logger.error(error);
@@ -102,7 +96,7 @@ router.patch(
           `Only the following statuses are supported: ${supportedStatuses}`,
         );
       }
-      await patchAnnouncements(data, user.admin_user_id);
+      await announcementService.patchAnnouncements(data, user.admin_user_id);
       res
         .status(201)
         .json({ message: `Updated the status of the announcement(s)` });
@@ -130,7 +124,7 @@ router.post(
       // Request body is validated
       const data = req.body;
       // Create announcement
-      const announcement = await createAnnouncement(data, user.admin_user_id);
+      const announcement = await announcementService.createAnnouncement(data, user.admin_user_id);
       res.status(201).json(announcement);
     } catch (error) {
       logger.error(error);
@@ -156,7 +150,7 @@ router.put(
       // Request body is validated
       const { file, ...data } = req.body;
       // Create announcement
-      const announcement = await updateAnnouncement(
+      const announcement = await announcementService.updateAnnouncement(
         req.params.id,
         data,
         user.admin_user_id,
@@ -171,7 +165,7 @@ router.put(
 
 router.get('/:id', authenticateAdmin(), async (req: Request, res) => {
   try {
-    const announcement = await getAnnouncementById(req.params.id);
+    const announcement = await announcementService.getAnnouncementById(req.params.id);
     return res.json(announcement);
   } catch (error) {
     logger.error(error);
diff --git a/backend/src/v1/routes/dashboard/announcement-metrics-routes.spec.ts b/backend/src/v1/routes/dashboard/announcement-metrics-routes.spec.ts
index 07ef329b6..e15b98098 100644
--- a/backend/src/v1/routes/dashboard/announcement-metrics-routes.spec.ts
+++ b/backend/src/v1/routes/dashboard/announcement-metrics-routes.spec.ts
@@ -5,7 +5,9 @@ import router from './announcement-metrics-routes';
 let app: Application;
 const getAnnouncementMetricsMock = jest.fn();
 jest.mock('../../services/announcements-service', () => ({
-  getAnnouncementMetrics: (...args) => getAnnouncementMetricsMock(...args),
+  announcementService: {
+    getAnnouncementMetrics: (...args) => getAnnouncementMetricsMock(...args),
+  },
 }));
 describe('announcement-metrics-routes', () => {
   beforeEach(() => {
diff --git a/backend/src/v1/routes/dashboard/announcement-metrics-routes.ts b/backend/src/v1/routes/dashboard/announcement-metrics-routes.ts
index 197c7dc8f..66c83965c 100644
--- a/backend/src/v1/routes/dashboard/announcement-metrics-routes.ts
+++ b/backend/src/v1/routes/dashboard/announcement-metrics-routes.ts
@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { getAnnouncementMetrics } from '../../services/announcements-service';
+import { announcementService } from '../../services/announcements-service';
 import { logger } from '../../../logger';
 
 const router = Router();
@@ -9,7 +9,7 @@ const router = Router();
  */
 router.get('/announcement-metrics', async (req, res) => {
   try {
-    const metrics = await getAnnouncementMetrics();
+    const metrics = await announcementService.getAnnouncementMetrics();
 
     res.json(metrics);
   } catch (error) {
diff --git a/backend/src/v1/routes/dashboard/index.spec.ts b/backend/src/v1/routes/dashboard/index.spec.ts
index 90dba4ef9..37a52d367 100644
--- a/backend/src/v1/routes/dashboard/index.spec.ts
+++ b/backend/src/v1/routes/dashboard/index.spec.ts
@@ -3,7 +3,7 @@ import request from 'supertest';
 import router from '.';
 
 jest.mock('../../services/announcements-service', () => ({
-  getAnnouncementMetrics: jest.fn(),
+  announcementService: { getAnnouncementMetrics: jest.fn() },
 }));
 jest.mock('../../services/admin-report-service', () => ({
   adminReportService: {
diff --git a/backend/src/v1/services/admin-user-invites-service.spec.ts b/backend/src/v1/services/admin-user-invites-service.spec.ts
index 37917b362..57ada97df 100644
--- a/backend/src/v1/services/admin-user-invites-service.spec.ts
+++ b/backend/src/v1/services/admin-user-invites-service.spec.ts
@@ -5,10 +5,7 @@ import {
 } from '../../constants/admin';
 import { UserInputError } from '../types/errors';
 import {
-  createInvite,
-  deleteInvite,
-  getPendingInvites,
-  resendInvite,
+  adminUserInvitesService,
 } from './admin-user-invites-service';
 
 const mockCreate = jest.fn();
@@ -52,7 +49,7 @@ describe('admin-user-invite-service', () => {
   describe('createInvite', () => {
     describe('when invitation does not exist', () => {
       it('should send a new invitation', async () => {
-        await createInvite(
+        await adminUserInvitesService.createInvite(
           faker.internet.email(),
           PTRT_USER_ROLE_NAME,
           faker.internet.userName(),
@@ -63,7 +60,7 @@ describe('admin-user-invite-service', () => {
       });
 
       it('should send a new invitation for admin', async () => {
-        await createInvite(
+        await adminUserInvitesService.createInvite(
           faker.internet.email(),
           PTRT_ADMIN_ROLE_NAME,
           faker.internet.userName(),
@@ -81,7 +78,7 @@ describe('admin-user-invite-service', () => {
     describe('when invitation exists', () => {
       it('should send a update invitation and send email', async () => {
         mockOnboardingFindFirst.mockResolvedValue({});
-        await createInvite(
+        await adminUserInvitesService.createInvite(
           faker.internet.email(),
           PTRT_ADMIN_ROLE_NAME,
           faker.internet.userName(),
@@ -95,7 +92,7 @@ describe('admin-user-invite-service', () => {
       it('should throw a UserInputError', async () => {
         mockAdminUserFindFirst.mockResolvedValue({});
         await expect(
-          createInvite(
+          adminUserInvitesService.createInvite(
             faker.internet.email(),
             PTRT_ADMIN_ROLE_NAME,
             faker.internet.userName(),
@@ -113,7 +110,7 @@ describe('admin-user-invite-service', () => {
       const userInvites = [{ id: '1' }, { id: '2' }];
       mockFindMany.mockResolvedValue(userInvites);
 
-      const result = await getPendingInvites();
+      const result = await adminUserInvitesService.getPendingInvites();
 
       expect(result).toEqual(userInvites);
       expect(mockFindMany).toHaveBeenCalledTimes(1);
@@ -132,7 +129,7 @@ describe('admin-user-invite-service', () => {
       const deletedInvite = { id };
       mockDelete.mockResolvedValue(deletedInvite);
 
-      const result = await deleteInvite(id);
+      const result = await adminUserInvitesService.deleteInvite(id);
 
       expect(result).toEqual(deletedInvite);
       expect(mockDelete).toHaveBeenCalledTimes(1);
@@ -147,7 +144,7 @@ describe('admin-user-invite-service', () => {
   describe('resendInvite', () => {
     it('should send a new invitation', async () => {
       mockFindUniqueOrThrow.mockResolvedValue({});
-      await resendInvite(faker.string.uuid());
+      await adminUserInvitesService.resendInvite(faker.string.uuid());
       expect(mockSendEmailWithRetry).toHaveBeenCalledTimes(1);
     });
   });
diff --git a/backend/src/v1/services/admin-user-invites-service.ts b/backend/src/v1/services/admin-user-invites-service.ts
index 077bf3456..c1f17a682 100644
--- a/backend/src/v1/services/admin-user-invites-service.ts
+++ b/backend/src/v1/services/admin-user-invites-service.ts
@@ -9,142 +9,143 @@ import emailService from '../../external/services/ches';
 import { EMAIL_TEMPLATES } from '../email-templates';
 import prisma from '../prisma/prisma-client';
 import { UserInputError } from '../types/errors';
-/**
- * Create a new user invite and send email to user
- * @param email
- * @param role
- * @param firstname
- * @param createdBy
- */
-const createInvite = async (
-  email: string,
-  role: string,
-  firstname: string,
-  createdBy: string,
-) => {
-  const existingActiveUser = await prisma.admin_user.findFirst({
-    where: {
-      email: email,
-      is_active: true,
-    },
-  });
-  if (existingActiveUser) {
-    throw new UserInputError(
-      `There is already a user associated with email address '${email}'.`,
+
+export const adminUserInvitesService = {
+  /**
+   * Create a new user invite and send email to user
+   * @param email
+   * @param role
+   * @param firstname
+   * @param createdBy
+   */
+  async createInvite(
+    email: string,
+    role: string,
+    firstname: string,
+    createdBy: string,
+  ) {
+    const existingActiveUser = await prisma.admin_user.findFirst({
+      where: {
+        email: email,
+        is_active: true,
+      },
+    });
+    if (existingActiveUser) {
+      throw new UserInputError(
+        `There is already a user associated with email address '${email}'.`,
+      );
+    }
+    const pendingUserRequest = await prisma.admin_user_onboarding.findFirst({
+      where: {
+        email: email,
+        is_onboarded: false,
+        expiry_date: { lte: convert(ZonedDateTime.now(ZoneId.UTC)).toDate() },
+      },
+    });
+
+    const expiryDate = convert(
+      ZonedDateTime.now(ZoneId.UTC).plusHours(
+        config.get('server:adminInvitationDurationInHours'),
+      ),
+    ).toDate();
+
+    if (pendingUserRequest) {
+      await prisma.admin_user_onboarding.update({
+        where: {
+          admin_user_onboarding_id: pendingUserRequest.admin_user_onboarding_id,
+        },
+        data: {
+          expiry_date: expiryDate,
+        },
+      });
+    } else {
+      const roles =
+        role === PTRT_ADMIN_ROLE_NAME
+          ? [PTRT_ADMIN_ROLE_NAME, PTRT_USER_ROLE_NAME]
+          : [PTRT_USER_ROLE_NAME];
+      await prisma.admin_user_onboarding.create({
+        data: {
+          email: email,
+          first_name: firstname,
+          assigned_roles: roles.join(','),
+          is_onboarded: false,
+          created_by: createdBy,
+          expiry_date: expiryDate,
+        },
+      });
+    }
+    await this.sendUserEmailInvite(email, firstname);
+  },
+
+  /**
+   * Resend a user invite email to user and reset expiry date
+   * @param invitationId
+   */
+  async resendInvite(invitationId: string) {
+    const pendingUserRequest =
+      await prisma.admin_user_onboarding.findUniqueOrThrow({
+        where: {
+          admin_user_onboarding_id: invitationId,
+        },
+      });
+
+    await this.sendUserEmailInvite(
+      pendingUserRequest.email,
+      pendingUserRequest.first_name,
     );
-  }
-  const pendingUserRequest = await prisma.admin_user_onboarding.findFirst({
-    where: {
-      email: email,
-      is_onboarded: false,
-      expiry_date: { lte: convert(ZonedDateTime.now(ZoneId.UTC)).toDate() },
-    },
-  });
 
-  const expiryDate = convert(
-    ZonedDateTime.now(ZoneId.UTC).plusHours(
-      config.get('server:adminInvitationDurationInHours'),
-    ),
-  ).toDate();
+    const expiryDate = convert(
+      ZonedDateTime.now(ZoneId.UTC).plusHours(
+        config.get('server:adminInvitationDurationInHours'),
+      ),
+    ).toDate();
 
-  if (pendingUserRequest) {
     await prisma.admin_user_onboarding.update({
       where: {
-        admin_user_onboarding_id: pendingUserRequest.admin_user_onboarding_id,
+        admin_user_onboarding_id: invitationId,
       },
       data: {
         expiry_date: expiryDate,
       },
     });
-  } else {
-    const roles =
-      role === PTRT_ADMIN_ROLE_NAME
-        ? [PTRT_ADMIN_ROLE_NAME, PTRT_USER_ROLE_NAME]
-        : [PTRT_USER_ROLE_NAME];
-    await prisma.admin_user_onboarding.create({
-      data: {
-        email: email,
-        first_name: firstname,
-        assigned_roles: roles.join(','),
+  },
+
+  async sendUserEmailInvite(email: string, firstname: string) {
+    const htmlEmail = emailService?.generateHtmlEmail(
+      EMAIL_TEMPLATES.USER_INVITE.subject,
+      [email],
+      EMAIL_TEMPLATES.USER_INVITE.title,
+      '',
+      EMAIL_TEMPLATES.USER_INVITE.body(firstname),
+    );
+    await emailService?.sendEmailWithRetry(htmlEmail, 3);
+  },
+
+  /**
+   * Get all pending user invites
+   * @returns {Promise<admin_user_onboarding[]>} Promise object represents the list of pending user invites
+   */
+  async getPendingInvites(): Promise<admin_user_onboarding[]> {
+    const userInvites = await prisma.admin_user_onboarding.findMany({
+      where: {
         is_onboarded: false,
-        created_by: createdBy,
-        expiry_date: expiryDate,
+        expiry_date: { gt: new Date() },
       },
     });
-  }
-  await sendUserEmailInvite(email, firstname);
-};
+    return userInvites;
+  },
 
-/**
- * Resend a user invite email to user and reset expiry date
- * @param invitationId
- */
-const resendInvite = async (invitationId: string) => {
-  const pendingUserRequest =
-    await prisma.admin_user_onboarding.findUniqueOrThrow({
+  /**
+   * Delete a user invite
+   * @param {string} id - The id of the user invite to delete
+   * @returns {Promise<admin_user_onboarding>} Promise object represents the deleted user invite
+   */
+  async deleteInvite(id: string): Promise<admin_user_onboarding> {
+    const deletedInvite = await prisma.admin_user_onboarding.delete({
       where: {
-        admin_user_onboarding_id: invitationId,
+        admin_user_onboarding_id: id,
       },
     });
-
-  await sendUserEmailInvite(
-    pendingUserRequest.email,
-    pendingUserRequest.first_name,
-  );
-
-  const expiryDate = convert(
-    ZonedDateTime.now(ZoneId.UTC).plusHours(
-      config.get('server:adminInvitationDurationInHours'),
-    ),
-  ).toDate();
-
-  await prisma.admin_user_onboarding.update({
-    where: {
-      admin_user_onboarding_id: invitationId,
-    },
-    data: {
-      expiry_date: expiryDate,
-    },
-  });
-};
-
-const sendUserEmailInvite = async (email: string, firstname: string) => {
-  const htmlEmail = emailService?.generateHtmlEmail(
-    EMAIL_TEMPLATES.USER_INVITE.subject,
-    [email],
-    EMAIL_TEMPLATES.USER_INVITE.title,
-    '',
-    EMAIL_TEMPLATES.USER_INVITE.body(firstname),
-  );
-  await emailService?.sendEmailWithRetry(htmlEmail, 3);
-};
-
-/**
- * Get all pending user invites
- * @returns {Promise<admin_user_onboarding[]>} Promise object represents the list of pending user invites
- */
-const getPendingInvites = async (): Promise<admin_user_onboarding[]> => {
-  const userInvites = await prisma.admin_user_onboarding.findMany({
-    where: {
-      is_onboarded: false,
-      expiry_date: { gt: new Date() },
-    },
-  });
-  return userInvites;
-};
-
-/**
- * Delete a user invite
- * @param {string} id - The id of the user invite to delete
- * @returns {Promise<admin_user_onboarding>} Promise object represents the deleted user invite
- */
-const deleteInvite = async (id: string): Promise<admin_user_onboarding> => {
-  const deletedInvite = await prisma.admin_user_onboarding.delete({
-    where: {
-      admin_user_onboarding_id: id,
-    },
-  });
-  return deletedInvite;
+    return deletedInvite;
+  },
 };
-
-export { createInvite, deleteInvite, getPendingInvites, resendInvite };
diff --git a/backend/src/v1/services/analytic-service.spec.ts b/backend/src/v1/services/analytic-service.spec.ts
index 4c24cdf12..dba6d9854 100644
--- a/backend/src/v1/services/analytic-service.spec.ts
+++ b/backend/src/v1/services/analytic-service.spec.ts
@@ -1,5 +1,5 @@
 import {
-  getEmbedInfo,
+  analyticsService,
   PowerBiEmbedInfo,
   PowerBiResourceName,
 } from './analytic-service';
@@ -22,16 +22,16 @@ describe('getEmbedInfo', () => {
     jest.clearAllMocks();
   });
 
-  it('should return json', async () => {
+  it('should return json when given multiple resources to embed', async () => {
     const output: PowerBiEmbedInfo = {
       resources: [
         {
-          name: PowerBiResourceName.SubmissionAnalytics,
+          name: PowerBiResourceName.Analytics,
           id: '123',
           embedUrl: 'foo.bar.ca',
         },
         {
-          name: PowerBiResourceName.DataAnalytics,
+          name: PowerBiResourceName.Analytics,
           id: '123',
           embedUrl: 'foo.bar.ca',
         },
@@ -47,11 +47,21 @@ describe('getEmbedInfo', () => {
       ],
       embedToken: { token: output.accessToken, expiration: output.expiry },
     });
-    const json = await getEmbedInfo([
-      PowerBiResourceName.SubmissionAnalytics,
-      PowerBiResourceName.DataAnalytics,
+    const json = await analyticsService.getEmbedInfo([
+      PowerBiResourceName.Analytics,
+      PowerBiResourceName.Analytics,
     ]);
     expect(mockGetEmbedParamsForReports).toHaveBeenCalledTimes(1);
     expect(json).toMatchObject(output);
   });
+
+  it('should throw error if invalid resource names', async () => {
+    await expect(
+      analyticsService.getEmbedInfo([
+        PowerBiResourceName.Analytics,
+        'invalid' as never,
+      ]),
+    ).rejects.toThrow('Invalid resource names');
+    expect(mockGetEmbedParamsForReports).not.toHaveBeenCalled();
+  });
 });
diff --git a/backend/src/v1/services/analytic-service.ts b/backend/src/v1/services/analytic-service.ts
index 5bb23efba..59c1cfb8b 100644
--- a/backend/src/v1/services/analytic-service.ts
+++ b/backend/src/v1/services/analytic-service.ts
@@ -12,56 +12,57 @@ export type PowerBiEmbedInfo = {
 };
 
 export enum PowerBiResourceName {
-  SubmissionAnalytics = 'SubmissionAnalytics',
-  UserBehaviour = 'UserBehaviour',
-  DataAnalytics = 'DataAnalytics',
+  Analytics = 'Analytics',
 }
 
 const resourceIds: Record<PowerBiResourceName, ReportInWorkspace> = {
-  SubmissionAnalytics: {
+  Analytics: {
     workspaceId: config.get('powerbi:analytics:workspaceId'),
-    reportId: config.get('powerbi:analytics:submissionAnalyticsId'),
-  },
-  UserBehaviour: {
-    workspaceId: config.get('powerbi:analytics:workspaceId'),
-    reportId: config.get('powerbi:analytics:userBehaviourId'),
-  },
-  DataAnalytics: {
-    workspaceId: config.get('powerbi:analytics:workspaceId'),
-    reportId: config.get('powerbi:analytics:dataAnalyticsId'),
+    reportId: config.get('powerbi:analytics:analyticsId'),
   },
 };
 
-/**
- * Generate embed token and embed urls for PowerBi resources
- * @return Details like Embed URL, Access token and Expiry
- */
-export async function getEmbedInfo(
-  resourceNames: PowerBiResourceName[],
-): Promise<PowerBiEmbedInfo> {
-  const powerBi = new PowerBiService(
-    config.get('powerbi:powerBiUrl'),
-    config.get('entra:clientId'),
-    config.get('entra:clientSecret'),
-    config.get('entra:tenantId'),
-  );
+export const analyticsService = {
+  /**
+   * Generate embed token and embed urls for PowerBi resources
+   * @return Details like Embed URL, Access token and Expiry
+   */
+  async getEmbedInfo(
+    resourceNames: PowerBiResourceName[],
+  ): Promise<PowerBiEmbedInfo> {
+    if (
+      !Array.isArray(resourceNames) ||
+      !resourceNames.every((name) =>
+        Object.values(PowerBiResourceName).includes(name),
+      )
+    ) {
+      throw new Error('Invalid resource names');
+    }
 
-  const embedParams = await powerBi.getEmbedParamsForReports(
-    resourceNames.map((name) => resourceIds[name]),
-  );
+    const powerBi = new PowerBiService(
+      config.get('powerbi:powerBiUrl'),
+      config.get('entra:clientId'),
+      config.get('entra:clientSecret'),
+      config.get('entra:tenantId'),
+    );
 
-  const resources = [];
-  for (let i = 0; i < resourceNames.length; ++i) {
-    resources.push({
-      name: resourceNames[i],
-      id: embedParams.resources[i].id,
-      embedUrl: embedParams.resources[i].embedUrl,
-    });
-  }
+    const embedParams = await powerBi.getEmbedParamsForReports(
+      resourceNames.map((name) => resourceIds[name]),
+    );
 
-  return {
-    resources: resources,
-    accessToken: embedParams.embedToken.token,
-    expiry: embedParams.embedToken.expiration,
-  };
-}
+    const resources = [];
+    for (let i = 0; i < resourceNames.length; ++i) {
+      resources.push({
+        name: resourceNames[i],
+        id: embedParams.resources[i].id,
+        embedUrl: embedParams.resources[i].embedUrl,
+      });
+    }
+
+    return {
+      resources: resources,
+      accessToken: embedParams.embedToken.token,
+      expiry: embedParams.embedToken.expiration,
+    };
+  },
+};
diff --git a/backend/src/v1/services/announcements-service.spec.ts b/backend/src/v1/services/announcements-service.spec.ts
index 294db4b4c..402ed46b7 100644
--- a/backend/src/v1/services/announcements-service.spec.ts
+++ b/backend/src/v1/services/announcements-service.spec.ts
@@ -5,10 +5,9 @@ import {
   AnnouncementStatus,
 } from '../types/announcements';
 import { UserInputError } from '../types/errors';
-import * as AnnouncementService from './announcements-service';
+import { announcementService } from './announcements-service';
 import { utils } from './utils-service';
 import { LocalDateTime, ZonedDateTime, ZoneId } from '@js-joda/core';
-import { getAnnouncementMetrics, updateAnnouncement } from './announcements-service';
 
 const mockFindMany = jest.fn().mockResolvedValue([
   {
@@ -96,7 +95,7 @@ describe('AnnouncementsService', () => {
   describe('getAnnouncements', () => {
     describe('when no query is provided', () => {
       it('should return announcements', async () => {
-        const announcements = await AnnouncementService.getAnnouncements();
+        const announcements = await announcementService.getAnnouncements();
         expect(announcements.items).toHaveLength(2);
         expect(announcements.total).toBe(2);
         expect(announcements.offset).toBe(0);
@@ -119,7 +118,7 @@ describe('AnnouncementsService', () => {
       describe('when filters are provided', () => {
         describe('when title is provided', () => {
           it('should return announcements', async () => {
-            await AnnouncementService.getAnnouncements({
+            await announcementService.getAnnouncements({
               filters: [
                 { key: 'title', operation: 'like', value: 'Announcement 1' },
               ],
@@ -143,7 +142,7 @@ describe('AnnouncementsService', () => {
         describe('when active_on filter is provided', () => {
           describe('when operation is "between"', () => {
             it('should return announcements', async () => {
-              await AnnouncementService.getAnnouncements({
+              await announcementService.getAnnouncements({
                 filters: [
                   {
                     key: 'active_on',
@@ -165,7 +164,7 @@ describe('AnnouncementsService', () => {
           });
           describe('when operation is "lte"', () => {
             it('should return announcements', async () => {
-              await AnnouncementService.getAnnouncements({
+              await announcementService.getAnnouncements({
                 filters: [
                   {
                     key: 'active_on',
@@ -185,7 +184,7 @@ describe('AnnouncementsService', () => {
           });
           describe('when operation is "gt"', () => {
             it('should return announcements', async () => {
-              await AnnouncementService.getAnnouncements({
+              await announcementService.getAnnouncements({
                 filters: [
                   {
                     key: 'active_on',
@@ -207,7 +206,7 @@ describe('AnnouncementsService', () => {
         describe('when expires_on filter is provided', () => {
           describe('when operation is "between"', () => {
             it('should return announcements', async () => {
-              await AnnouncementService.getAnnouncements({
+              await announcementService.getAnnouncements({
                 filters: [
                   {
                     key: 'expires_on',
@@ -229,7 +228,7 @@ describe('AnnouncementsService', () => {
           });
           describe('when operation is "lte"', () => {
             it('should return announcements', async () => {
-              await AnnouncementService.getAnnouncements({
+              await announcementService.getAnnouncements({
                 filters: [
                   {
                     key: 'expires_on',
@@ -249,7 +248,7 @@ describe('AnnouncementsService', () => {
           });
           describe('when operation is "gt"', () => {
             it('should return announcements', async () => {
-              await AnnouncementService.getAnnouncements({
+              await announcementService.getAnnouncements({
                 filters: [
                   {
                     key: 'expires_on',
@@ -279,7 +278,7 @@ describe('AnnouncementsService', () => {
         describe('when status filter is provided', () => {
           describe('in operation', () => {
             it('should return announcements', async () => {
-              await AnnouncementService.getAnnouncements({
+              await announcementService.getAnnouncements({
                 filters: [
                   {
                     key: 'status',
@@ -300,7 +299,7 @@ describe('AnnouncementsService', () => {
 
           describe('notin operation', () => {
             it('should return announcements', async () => {
-              await AnnouncementService.getAnnouncements({
+              await announcementService.getAnnouncements({
                 filters: [
                   {
                     key: 'status',
@@ -323,7 +322,7 @@ describe('AnnouncementsService', () => {
 
       describe('when sort is provided', () => {
         it('should return announcements', async () => {
-          await AnnouncementService.getAnnouncements({
+          await announcementService.getAnnouncements({
             sort: [{ field: 'title', order: 'asc' }],
           });
           expect(mockFindMany).toHaveBeenCalledWith(
@@ -336,7 +335,7 @@ describe('AnnouncementsService', () => {
 
       describe('when limit is provided', () => {
         it('should return announcements', async () => {
-          await AnnouncementService.getAnnouncements({ limit: 5 });
+          await announcementService.getAnnouncements({ limit: 5 });
           expect(mockFindMany).toHaveBeenCalledWith(
             expect.objectContaining({
               take: 5,
@@ -347,7 +346,7 @@ describe('AnnouncementsService', () => {
 
       describe('when offset is provided', () => {
         it('should return announcements', async () => {
-          await AnnouncementService.getAnnouncements({ offset: 5 });
+          await announcementService.getAnnouncements({ offset: 5 });
           expect(mockFindMany).toHaveBeenCalledWith(
             expect.objectContaining({
               skip: 5,
@@ -367,7 +366,7 @@ describe('AnnouncementsService', () => {
         ];
         const mockUserId = 'user-id';
         await expect(
-          AnnouncementService.patchAnnouncements(data, mockUserId),
+          announcementService.patchAnnouncements(data, mockUserId),
         ).rejects.toThrow(UserInputError);
       });
     });
@@ -389,7 +388,7 @@ describe('AnnouncementsService', () => {
             announcement_resource: [],
           },
         ]);
-        await AnnouncementService.patchAnnouncements(
+        await announcementService.patchAnnouncements(
           [
             { id: '1', status: AnnouncementStatus.Deleted },
             { id: '2', status: AnnouncementStatus.Draft },
@@ -445,7 +444,7 @@ describe('AnnouncementsService', () => {
         attachmentId: 'attachment-id',
         fileDisplayName: faker.lorem.words(3),
       };
-      await AnnouncementService.createAnnouncement(
+      await announcementService.createAnnouncement(
         announcementInput,
         'user-id',
       );
@@ -501,7 +500,7 @@ describe('AnnouncementsService', () => {
         linkDisplayName: '',
         linkUrl: '',
       };
-      await AnnouncementService.createAnnouncement(
+      await announcementService.createAnnouncement(
         announcementInput,
         'user-id',
       );
@@ -542,7 +541,7 @@ describe('AnnouncementsService', () => {
           linkDisplayName: faker.lorem.words(3),
           linkUrl: faker.internet.url(),
         };
-        await AnnouncementService.updateAnnouncement(
+        await announcementService.updateAnnouncement(
           'announcement-id',
           announcementInput,
           'user-id',
@@ -591,7 +590,7 @@ describe('AnnouncementsService', () => {
           active_on: faker.date.future().toISOString(),
           status: AnnouncementStatus.Published,
         };
-        await AnnouncementService.updateAnnouncement(
+        await announcementService.updateAnnouncement(
           'announcement-id',
           announcementInput,
           'user-id',
@@ -636,7 +635,7 @@ describe('AnnouncementsService', () => {
           linkDisplayName: faker.lorem.words(3),
           linkUrl: faker.internet.url(),
         };
-        await AnnouncementService.updateAnnouncement(
+        await announcementService.updateAnnouncement(
           'announcement-id',
           announcementInput,
           'user-id',
@@ -703,7 +702,7 @@ describe('AnnouncementsService', () => {
           attachmentId: attachmentId,
           fileDisplayName: faker.lorem.words(3),
         };
-        await AnnouncementService.updateAnnouncement(
+        await announcementService.updateAnnouncement(
           'announcement-id',
           announcementInput,
           'user-id',
@@ -757,7 +756,7 @@ describe('AnnouncementsService', () => {
             active_on: faker.date.future().toISOString(),
             status: 'PUBLISHED',
           };
-          await updateAnnouncement(
+          await announcementService.updateAnnouncement(
             'announcement-id',
             announcementInput,
             'user-id',
@@ -790,7 +789,7 @@ describe('AnnouncementsService', () => {
           attachmentId: faker.string.uuid(),
           fileDisplayName: faker.lorem.word(),
         };
-        await AnnouncementService.updateAnnouncement(
+        await announcementService.updateAnnouncement(
           'announcement-id',
           announcementInput,
           'user-id',
@@ -851,7 +850,7 @@ describe('AnnouncementsService', () => {
         linkDisplayName: '',
         linkUrl: '',
       };
-      await AnnouncementService.updateAnnouncement(
+      await announcementService.updateAnnouncement(
         'announcement-id',
         announcementInput,
         'user-id',
@@ -873,9 +872,9 @@ describe('AnnouncementsService', () => {
       it('exits without updating any announcements', async () => {
         mockFindMany.mockResolvedValue([]);
         const patchAnnouncementsMock = jest
-          .spyOn(AnnouncementService, 'patchAnnouncements')
+          .spyOn(announcementService, 'patchAnnouncements')
           .mockImplementation();
-        await AnnouncementService.expireAnnouncements();
+        await announcementService.expireAnnouncements();
         expect(mockFindMany).toHaveBeenCalled();
         expect(patchAnnouncementsMock).not.toHaveBeenCalled();
       });
@@ -884,10 +883,10 @@ describe('AnnouncementsService', () => {
       it('updates the announcements', async () => {
         mockFindMany.mockResolvedValue([{ announcement_id: '123' }]);
         const patchAnnouncementsMock = jest.spyOn(
-          AnnouncementService,
+          announcementService,
           'patchAnnouncements',
         );
-        await AnnouncementService.expireAnnouncements();
+        await announcementService.expireAnnouncements();
         expect(mockFindMany).toHaveBeenCalled();
         expect(patchAnnouncementsMock).toHaveBeenCalled();
       });
@@ -904,7 +903,7 @@ describe('AnnouncementsService', () => {
             zone,
           ),
         );
-      await AnnouncementService.getExpiringAnnouncements();
+      await announcementService.getExpiringAnnouncements();
 
       expect(mockFindMany).toHaveBeenCalledWith({
         where: {
@@ -920,7 +919,7 @@ describe('AnnouncementsService', () => {
 
   describe('getAnnouncementById', () => {
     it('should return announcement by id', async () => {
-      await AnnouncementService.getAnnouncementById('1');
+      await announcementService.getAnnouncementById('1');
       expect(mockFindUniqueOrThrow).toHaveBeenCalledWith({
         where: { announcement_id: '1' },
         include: { announcement_resource: true },
@@ -931,7 +930,7 @@ describe('AnnouncementsService', () => {
   describe('getAnnouncementMetrics', () => {
     it('should return the announcement metrics', async () => {
       // Act
-      const result = await getAnnouncementMetrics();
+      const result = await announcementService.getAnnouncementMetrics();
 
       // Assert
       expect(result).toEqual({
diff --git a/backend/src/v1/services/announcements-service.ts b/backend/src/v1/services/announcements-service.ts
index a751f5ee2..d18610257 100644
--- a/backend/src/v1/services/announcements-service.ts
+++ b/backend/src/v1/services/announcements-service.ts
@@ -123,207 +123,43 @@ const buildAnnouncementSortInput = (query: AnnouncementQueryType) => {
 
 const DEFAULT_PAGE_SIZE = 10;
 
-/**
- * Get announcements based on query parameters
- * @param query
- * @returns
- */
-export const getAnnouncements = async (
-  query: AnnouncementQueryType = {},
-): Promise<PaginatedResult<announcement>> => {
-  const where = buildAnnouncementWhereInput(query);
-  const orderBy = buildAnnouncementSortInput(query);
-  const items = await prisma.announcement.findMany({
-    where,
-    orderBy,
-    take: query.limit || DEFAULT_PAGE_SIZE,
-    skip: query.offset || 0,
-    include: {
-      announcement_resource: true,
-    },
-  });
-  const total = await prisma.announcement.count({ where });
-
-  return {
-    items,
-    total,
-    limit: query.limit || DEFAULT_PAGE_SIZE,
-    offset: query.offset || 0,
-    totalPages: Math.ceil(total / (query.limit || DEFAULT_PAGE_SIZE)),
-  };
-};
-
-/**
- * Get announcement by id
- * @param id
- * @returns
- */
-export const getAnnouncementById = async (
-  id: string,
-): Promise<announcement> => {
-  return prisma.announcement.findUniqueOrThrow({
-    where: {
-      announcement_id: id,
-    },
-    include: {
-      announcement_resource: true,
-    },
-  });
-};
-
-/**
- * Patch announcements by ids.
- * This method also copies the original record into the announcement history table.
- * @param data - array of objects with format:
- * { id: announcement_id, status: status}
- * Currently the 'status' attribute is the only attribute that supports patching,
- * and the only status values that are supported are ['DELETED', 'DRAFT', 'EXPIRED']
- * @param userId - user id who is patching the announcements, or undefined
- * if no 'updated_by' user should be recorded
- * @param tx - an optional Prisma transaction.  if specified, performs the work within
- * the given existing transaction.  if omitted, performs the workin within a new
- * transaction
- */
-export const patchAnnouncements = async (
-  data: PatchAnnouncementsType,
-  userId: string | null = null,
-  tx?: any,
-) => {
-  const supportedStatuses = [
-    AnnouncementStatus.Deleted,
-    AnnouncementStatus.Draft,
-    AnnouncementStatus.Expired,
-  ];
-  const hasUnsupportedUpdates = data.filter(
-    (item) => supportedStatuses.indexOf(item.status as any) < 0,
-  ).length;
-  if (hasUnsupportedUpdates) {
-    throw new UserInputError(
-      `Invalid status. Only the following statuses are supported: ${supportedStatuses}`,
-    );
-  }
-
-  //An inner function which performs the database updates associated with
-  //this patch operation.
-  const applyPatch = async (tx) => {
-    const announcements = await tx.announcement.findMany({
-      where: { announcement_id: { in: data.map((item) => item.id) } },
-      include: { announcement_resource: true },
+export const announcementService = {
+  /**
+   * Get announcements based on query parameters
+   * @param query
+   * @returns
+   */
+  async getAnnouncements(
+    query: AnnouncementQueryType = {},
+  ): Promise<PaginatedResult<announcement>> {
+    const where = buildAnnouncementWhereInput(query);
+    const orderBy = buildAnnouncementSortInput(query);
+    const items = await prisma.announcement.findMany({
+      where,
+      orderBy,
+      take: query.limit || DEFAULT_PAGE_SIZE,
+      skip: query.offset || 0,
+      include: {
+        announcement_resource: true,
+      },
     });
-
-    for (const announcement of announcements) {
-      await saveHistory(tx, announcement);
-    }
-    const updateDate = ZonedDateTime.now(ZoneId.UTC);
-
-    const updates = data
-      .filter((item) => supportedStatuses.indexOf(item.status as any) >= 0)
-      .map((item) => ({
-        announcement_id: item.id,
-        status: item.status,
-        updated_by: userId,
-        updated_date: convert(updateDate).toDate(),
-      }));
-
-    const typeHints = {
-      updated_by: 'UUID',
+    const total = await prisma.announcement.count({ where });
+
+    return {
+      items,
+      total,
+      limit: query.limit || DEFAULT_PAGE_SIZE,
+      offset: query.offset || 0,
+      totalPages: Math.ceil(total / (query.limit || DEFAULT_PAGE_SIZE)),
     };
-    //None of the data passed to this method is directly from user input.
-    //The input 'data' object is validated and then translated into another form
-    //(the 'updates' object).  For these reasons it is considerer safe to
-    //run a database statement ('updateManyUnsafe') that does not internally
-    //perform data safety checks.
-    await utils.updateManyUnsafe(
-      tx,
-      updates,
-      typeHints,
-      'announcement',
-      'announcement_id',
-    );
-  };
-
-  //If there is an existing transaction, apply the patch within it, otherwise
-  //create a new transaction and apply the patch within that.
-  const enterTransaction = tx
-    ? applyPatch(tx)
-    : prisma.$transaction(applyPatch);
-
-  return enterTransaction;
-};
-
-/**
- * Create announcement
- * @param data - announcement data
- */
-export const createAnnouncement = async (
-  input: AnnouncementDataType,
-  currentUserId: string,
-) => {
-  const resources: Prisma.announcement_resourceCreateManyAnnouncementInput[] =
-    [];
-  if (input.attachmentId && input.fileDisplayName) {
-    resources.push({
-      display_name: input.fileDisplayName,
-      attachment_file_id: input.attachmentId,
-      resource_type: 'ATTACHMENT',
-      created_by: currentUserId,
-      updated_by: currentUserId,
-    });
-  }
-
-  if (input.linkUrl) {
-    resources.push({
-      display_name: input.linkDisplayName,
-      resource_url: input.linkUrl,
-      resource_type: 'LINK',
-      created_by: currentUserId,
-      updated_by: currentUserId,
-    });
-  }
-
-  if (
-    !isEmpty(input.active_on) &&
-    ZonedDateTime.parse(input.active_on).isBefore(ZonedDateTime.now())
-  ) {
-    input.active_on = ZonedDateTime.now().format(DateTimeFormatter.ISO_INSTANT);
-  }
-
-  const data: Prisma.announcementCreateInput = {
-    title: input.title,
-    description: input.description,
-    announcement_status: {
-      connect: { code: input.status },
-    },
-    active_on: !isEmpty(input.active_on) ? input.active_on : undefined,
-    expires_on: !isEmpty(input.expires_on) ? input.expires_on : undefined,
-    admin_user_announcement_created_byToadmin_user: {
-      connect: { admin_user_id: currentUserId },
-    },
-    admin_user_announcement_updated_byToadmin_user: {
-      connect: { admin_user_id: currentUserId },
-    },
-    announcement_resource:
-      resources.length > 0 ? { createMany: { data: resources } } : undefined,
-  };
-
-  return prisma.announcement.create({
-    data,
-  });
-};
-
-/**
- * Update announcement
- * @param id - announcement id
- * @param data - announcement data
- */
-export const updateAnnouncement = async (
-  id: string,
-  input: AnnouncementDataType,
-  currentUserId: string,
-) => {
-  const updateDate = convert(LocalDateTime.now(ZoneId.UTC)).toDate();
-  await prisma.$transaction(async (tx) => {
-    const announcementData = await tx.announcement.findUniqueOrThrow({
+  },
+  /**
+   * Get announcement by id
+   * @param id
+   * @returns
+   */
+  async getAnnouncementById(id: string): Promise<announcement> {
+    return prisma.announcement.findUniqueOrThrow({
       where: {
         announcement_id: id,
       },
@@ -331,110 +167,116 @@ export const updateAnnouncement = async (
         announcement_resource: true,
       },
     });
+  },
 
-    await saveHistory(tx, announcementData);
+  /**
+   * Patch announcements by ids.
+   * This method also copies the original record into the announcement history table.
+   * @param data - array of objects with format:
+   * { id: announcement_id, status: status}
+   * Currently the 'status' attribute is the only attribute that supports patching,
+   * and the only status values that are supported are ['DELETED', 'DRAFT', 'EXPIRED']
+   * @param userId - user id who is patching the announcements, or undefined
+   * if no 'updated_by' user should be recorded
+   * @param tx - an optional Prisma transaction.  if specified, performs the work within
+   * the given existing transaction.  if omitted, performs the workin within a new
+   * transaction
+   */
+  async patchAnnouncements(
+    data: PatchAnnouncementsType,
+    userId: string | null = null,
+    tx?: any,
+  ) {
+    const supportedStatuses = [
+      AnnouncementStatus.Deleted,
+      AnnouncementStatus.Draft,
+      AnnouncementStatus.Expired,
+    ];
+    const hasUnsupportedUpdates = data.filter(
+      (item) => supportedStatuses.indexOf(item.status as any) < 0,
+    ).length;
+    if (hasUnsupportedUpdates) {
+      throw new UserInputError(
+        `Invalid status. Only the following statuses are supported: ${supportedStatuses}`,
+      );
+    }
 
-    const currentLink = announcementData?.announcement_resource.find(
-      (x) => x.resource_type === 'LINK',
-    );
+    //An inner function which performs the database updates associated with
+    //this patch operation.
+    const applyPatch = async (tx) => {
+      const announcements = await tx.announcement.findMany({
+        where: { announcement_id: { in: data.map((item) => item.id) } },
+        include: { announcement_resource: true },
+      });
 
-    if (input.linkUrl) {
-      if (currentLink) {
-        await tx.announcement_resource.update({
-          where: {
-            announcement_resource_id: currentLink.announcement_resource_id,
-          },
-          data: {
-            display_name: input.linkDisplayName,
-            resource_url: input.linkUrl,
-            updated_by: currentUserId,
-            update_date: updateDate,
-          },
-        });
-      } else {
-        await tx.announcement_resource.create({
-          data: {
-            display_name: input.linkDisplayName,
-            resource_url: input.linkUrl,
-            announcement_resource_type: {
-              connect: { code: 'LINK' },
-            },
-            admin_user_announcement_resource_created_byToadmin_user: {
-              connect: { admin_user_id: currentUserId },
-            },
-            admin_user_announcement_resource_updated_byToadmin_user: {
-              connect: { admin_user_id: currentUserId },
-            },
-            announcement: {
-              connect: {
-                announcement_id: id,
-              },
-            },
-          },
-        });
+      for (const announcement of announcements) {
+        await saveHistory(tx, announcement);
       }
-    } else if (currentLink) {
-      await tx.announcement_resource.delete({
-        where: {
-          announcement_resource_id: currentLink.announcement_resource_id,
-        },
+      const updateDate = ZonedDateTime.now(ZoneId.UTC);
+
+      const updates = data
+        .filter((item) => supportedStatuses.indexOf(item.status as any) >= 0)
+        .map((item) => ({
+          announcement_id: item.id,
+          status: item.status,
+          updated_by: userId,
+          updated_date: convert(updateDate).toDate(),
+        }));
+
+      const typeHints = {
+        updated_by: 'UUID',
+      };
+      //None of the data passed to this method is directly from user input.
+      //The input 'data' object is validated and then translated into another form
+      //(the 'updates' object).  For these reasons it is considerer safe to
+      //run a database statement ('updateManyUnsafe') that does not internally
+      //perform data safety checks.
+      await utils.updateManyUnsafe(
+        tx,
+        updates,
+        typeHints,
+        'announcement',
+        'announcement_id',
+      );
+    };
+
+    //If there is an existing transaction, apply the patch within it, otherwise
+    //create a new transaction and apply the patch within that.
+    const enterTransaction = tx
+      ? applyPatch(tx)
+      : prisma.$transaction(applyPatch);
+
+    return enterTransaction;
+  },
+
+  /**
+   * Create announcement
+   * @param data - announcement data
+   */
+  async createAnnouncement(input: AnnouncementDataType, currentUserId: string) {
+    const resources: Prisma.announcement_resourceCreateManyAnnouncementInput[] =
+      [];
+    if (input.attachmentId && input.fileDisplayName) {
+      resources.push({
+        display_name: input.fileDisplayName,
+        attachment_file_id: input.attachmentId,
+        resource_type: 'ATTACHMENT',
+        created_by: currentUserId,
+        updated_by: currentUserId,
       });
     }
 
-    const currentAttachment = announcementData?.announcement_resource.find(
-      (x) => x.resource_type === 'ATTACHMENT',
-    );
-    if (input.attachmentId) {
-      if (currentAttachment) {
-        await tx.announcement_resource.update({
-          where: {
-            announcement_resource_id:
-              currentAttachment.announcement_resource_id,
-          },
-          data: {
-            display_name: input.fileDisplayName,
-            attachment_file_id: input.attachmentId,
-            updated_by: currentUserId,
-            update_date: updateDate,
-          },
-        });
-      } else {
-        await tx.announcement_resource.create({
-          data: {
-            display_name: input.fileDisplayName,
-            attachment_file_id: input.attachmentId,
-            announcement_resource_type: {
-              connect: { code: 'ATTACHMENT' },
-            },
-            admin_user_announcement_resource_created_byToadmin_user: {
-              connect: { admin_user_id: currentUserId },
-            },
-            admin_user_announcement_resource_updated_byToadmin_user: {
-              connect: { admin_user_id: currentUserId },
-            },
-            announcement: {
-              connect: {
-                announcement_id: id,
-              },
-            },
-          },
-        });
-      }
-    } else if (currentAttachment && !input.attachmentId) {
-      await tx.announcement_resource.update({
-        where: {
-          announcement_resource_id: currentAttachment.announcement_resource_id,
-        },
-        data: {
-          attachment_file_id: null,
-          updated_by: currentUserId,
-          update_date: updateDate,
-        },
+    if (input.linkUrl) {
+      resources.push({
+        display_name: input.linkDisplayName,
+        resource_url: input.linkUrl,
+        resource_type: 'LINK',
+        created_by: currentUserId,
+        updated_by: currentUserId,
       });
     }
 
     if (
-      input.status != AnnouncementStatus.Published && // If announcement is already published, don't change the active_on
       !isEmpty(input.active_on) &&
       ZonedDateTime.parse(input.active_on).isBefore(ZonedDateTime.now())
     ) {
@@ -443,105 +285,262 @@ export const updateAnnouncement = async (
       );
     }
 
-    const data: Prisma.announcementUpdateInput = {
+    const data: Prisma.announcementCreateInput = {
       title: input.title,
       description: input.description,
-      updated_date: updateDate,
       announcement_status: {
         connect: { code: input.status },
       },
-      active_on: !isEmpty(input.active_on) ? input.active_on : null,
-      expires_on: !isEmpty(input.expires_on) ? input.expires_on : null,
+      active_on: !isEmpty(input.active_on) ? input.active_on : undefined,
+      expires_on: !isEmpty(input.expires_on) ? input.expires_on : undefined,
+      admin_user_announcement_created_byToadmin_user: {
+        connect: { admin_user_id: currentUserId },
+      },
       admin_user_announcement_updated_byToadmin_user: {
         connect: { admin_user_id: currentUserId },
       },
+      announcement_resource:
+        resources.length > 0 ? { createMany: { data: resources } } : undefined,
     };
 
-    return tx.announcement.update({
-      where: { announcement_id: id },
+    return prisma.announcement.create({
       data,
     });
-  });
-};
+  },
 
-/* Identifies announcements that should be expired.  If any such announcements
+  /**
+   * Update announcement
+   * @param id - announcement id
+   * @param data - announcement data
+   */
+  async updateAnnouncement(
+    id: string,
+    input: AnnouncementDataType,
+    currentUserId: string,
+  ) {
+    const updateDate = convert(LocalDateTime.now(ZoneId.UTC)).toDate();
+    await prisma.$transaction(async (tx) => {
+      const announcementData = await tx.announcement.findUniqueOrThrow({
+        where: {
+          announcement_id: id,
+        },
+        include: {
+          announcement_resource: true,
+        },
+      });
+
+      await saveHistory(tx, announcementData);
+
+      const currentLink = announcementData?.announcement_resource.find(
+        (x) => x.resource_type === 'LINK',
+      );
+
+      if (input.linkUrl) {
+        if (currentLink) {
+          await tx.announcement_resource.update({
+            where: {
+              announcement_resource_id: currentLink.announcement_resource_id,
+            },
+            data: {
+              display_name: input.linkDisplayName,
+              resource_url: input.linkUrl,
+              updated_by: currentUserId,
+              update_date: updateDate,
+            },
+          });
+        } else {
+          await tx.announcement_resource.create({
+            data: {
+              display_name: input.linkDisplayName,
+              resource_url: input.linkUrl,
+              announcement_resource_type: {
+                connect: { code: 'LINK' },
+              },
+              admin_user_announcement_resource_created_byToadmin_user: {
+                connect: { admin_user_id: currentUserId },
+              },
+              admin_user_announcement_resource_updated_byToadmin_user: {
+                connect: { admin_user_id: currentUserId },
+              },
+              announcement: {
+                connect: {
+                  announcement_id: id,
+                },
+              },
+            },
+          });
+        }
+      } else if (currentLink) {
+        await tx.announcement_resource.delete({
+          where: {
+            announcement_resource_id: currentLink.announcement_resource_id,
+          },
+        });
+      }
+
+      const currentAttachment = announcementData?.announcement_resource.find(
+        (x) => x.resource_type === 'ATTACHMENT',
+      );
+      if (input.attachmentId) {
+        if (currentAttachment) {
+          await tx.announcement_resource.update({
+            where: {
+              announcement_resource_id:
+                currentAttachment.announcement_resource_id,
+            },
+            data: {
+              display_name: input.fileDisplayName,
+              attachment_file_id: input.attachmentId,
+              updated_by: currentUserId,
+              update_date: updateDate,
+            },
+          });
+        } else {
+          await tx.announcement_resource.create({
+            data: {
+              display_name: input.fileDisplayName,
+              attachment_file_id: input.attachmentId,
+              announcement_resource_type: {
+                connect: { code: 'ATTACHMENT' },
+              },
+              admin_user_announcement_resource_created_byToadmin_user: {
+                connect: { admin_user_id: currentUserId },
+              },
+              admin_user_announcement_resource_updated_byToadmin_user: {
+                connect: { admin_user_id: currentUserId },
+              },
+              announcement: {
+                connect: {
+                  announcement_id: id,
+                },
+              },
+            },
+          });
+        }
+      } else if (currentAttachment && !input.attachmentId) {
+        await tx.announcement_resource.update({
+          where: {
+            announcement_resource_id:
+              currentAttachment.announcement_resource_id,
+          },
+          data: {
+            attachment_file_id: null,
+            updated_by: currentUserId,
+            update_date: updateDate,
+          },
+        });
+      }
+
+      if (
+        input.status != AnnouncementStatus.Published && // If announcement is already published, don't change the active_on
+        !isEmpty(input.active_on) &&
+        ZonedDateTime.parse(input.active_on).isBefore(ZonedDateTime.now())
+      ) {
+        input.active_on = ZonedDateTime.now().format(
+          DateTimeFormatter.ISO_INSTANT,
+        );
+      }
+
+      const data: Prisma.announcementUpdateInput = {
+        title: input.title,
+        description: input.description,
+        updated_date: updateDate,
+        announcement_status: {
+          connect: { code: input.status },
+        },
+        active_on: !isEmpty(input.active_on) ? input.active_on : null,
+        expires_on: !isEmpty(input.expires_on) ? input.expires_on : null,
+        admin_user_announcement_updated_byToadmin_user: {
+          connect: { admin_user_id: currentUserId },
+        },
+      };
+
+      return tx.announcement.update({
+        where: { announcement_id: id },
+        data,
+      });
+    });
+  },
+
+  /* Identifies announcements that should be expired.  If any such announcements
 are found, marks them as expired */
-export const expireAnnouncements = async () => {
-  const nowUtc = convert(ZonedDateTime.now(ZoneId.UTC)).toDate();
-  await prisma.$transaction(async (tx) => {
-    const announcements = await prisma.announcement.findMany({
-      select: {
-        announcement_id: true,
-      },
+  async expireAnnouncements() {
+    const nowUtc = convert(ZonedDateTime.now(ZoneId.UTC)).toDate();
+    await prisma.$transaction(async (tx) => {
+      const announcements = await prisma.announcement.findMany({
+        select: {
+          announcement_id: true,
+        },
+        where: {
+          status: AnnouncementStatus.Published,
+          expires_on: {
+            not: null,
+            lte: nowUtc,
+          },
+        },
+      });
+      const patchData = announcements.map((a) => {
+        return {
+          id: a.announcement_id,
+          status: AnnouncementStatus.Expired as any,
+        };
+      });
+      if (patchData.length) {
+        logger.info(
+          `Marking ${patchData.length} announcement(s) as ${AnnouncementStatus.Expired}`,
+        );
+        await this.patchAnnouncements(patchData, undefined, tx);
+      } else {
+        logger.info(`Found no announcements that need to be expired`);
+      }
+    });
+  },
+
+  /** Get announcements that are 10 days away from expiring */
+  async getExpiringAnnouncements(): Promise<announcement[]> {
+    const zone = ZoneId.of(config.get('server:schedulerTimeZone'));
+    const targetDate = ZonedDateTime.now(zone)
+      .plusDays(14)
+      .withHour(0)
+      .withMinute(0)
+      .withSecond(0)
+      .withNano(0);
+
+    const items = await prisma.announcement.findMany({
       where: {
         status: AnnouncementStatus.Published,
         expires_on: {
-          not: null,
-          lte: nowUtc,
+          gte: convert(targetDate).toDate(),
+          lt: convert(targetDate.plusDays(1)).toDate(),
         },
       },
     });
-    const patchData = announcements.map((a) => {
-      return {
-        id: a.announcement_id,
-        status: AnnouncementStatus.Expired as any,
-      };
-    });
-    if (patchData.length) {
-      logger.info(
-        `Marking ${patchData.length} announcement(s) as ${AnnouncementStatus.Expired}`,
-      );
-      await patchAnnouncements(patchData, undefined, tx);
-    } else {
-      logger.info(`Found no announcements that need to be expired`);
-    }
-  });
-};
 
-/** Get announcements that are 10 days away from expiring */
-export const getExpiringAnnouncements = async (): Promise<announcement[]> => {
-  const zone = ZoneId.of(config.get('server:schedulerTimeZone'));
-  const targetDate = ZonedDateTime.now(zone)
-    .plusDays(14)
-    .withHour(0)
-    .withMinute(0)
-    .withSecond(0)
-    .withNano(0);
-
-  const items = await prisma.announcement.findMany({
-    where: {
-      status: AnnouncementStatus.Published,
-      expires_on: {
-        gte: convert(targetDate).toDate(),
-        lt: convert(targetDate.plusDays(1)).toDate(),
-      },
-    },
-  });
-
-  logger.info(
-    `Found ${items.length} expiring announcements between ${targetDate.toString()} and ${targetDate.plusDays(1).toString()}`,
-  );
-  return items;
-};
+    logger.info(
+      `Found ${items.length} expiring announcements between ${targetDate.toString()} and ${targetDate.plusDays(1).toString()}`,
+    );
+    return items;
+  },
 
-/**
- * Get announcement metrics
- * @param param0
- * @returns
- */
-export const getAnnouncementMetrics = async () => {
-  const announcementsData = await prisma.announcement.groupBy({
-    where: { status: { in: ['PUBLISHED', 'DRAFT'] } },
-    by: ['status'],
-    _count: true,
-  });
+  /**
+   * Get announcement metrics
+   * @param param0
+   * @returns
+   */
+  async getAnnouncementMetrics() {
+    const announcementsData = await prisma.announcement.groupBy({
+      where: { status: { in: ['PUBLISHED', 'DRAFT'] } },
+      by: ['status'],
+      _count: true,
+    });
 
-  const announcementsMetrics = announcementsData.reduce((acc, curr) => {
-    const key = curr.status.toLowerCase();
-    return { ...acc, [key]: { count: curr._count } };
-  }, {});
+    const announcementsMetrics = announcementsData.reduce((acc, curr) => {
+      const key = curr.status.toLowerCase();
+      return { ...acc, [key]: { count: curr._count } };
+    }, {});
 
-  return {
-    ...announcementsMetrics,
-  };
+    return {
+      ...announcementsMetrics,
+    };
+  },
 };
diff --git a/backend/src/v1/services/scheduler-service.spec.ts b/backend/src/v1/services/scheduler-service.spec.ts
index 17b61b117..3f4aec087 100644
--- a/backend/src/v1/services/scheduler-service.spec.ts
+++ b/backend/src/v1/services/scheduler-service.spec.ts
@@ -74,7 +74,9 @@ jest.mock('../../external/services/ches', () => ({
 
 const mockGetExpiringAnnouncements = jest.fn();
 jest.mock('./announcements-service', () => ({
-  getExpiringAnnouncements: () => mockGetExpiringAnnouncements(),
+  announcementService: {
+    getExpiringAnnouncements: () => mockGetExpiringAnnouncements(),
+  },
 }));
 
 const mockGetUsers = jest.fn();
diff --git a/backend/src/v1/services/scheduler-service.ts b/backend/src/v1/services/scheduler-service.ts
index fa8aa861e..ee05eb147 100644
--- a/backend/src/v1/services/scheduler-service.ts
+++ b/backend/src/v1/services/scheduler-service.ts
@@ -8,7 +8,7 @@ import prisma from '../prisma/prisma-client';
 import { enumReportStatus } from './report-service';
 import { logger } from '../../logger';
 import { Prisma } from '@prisma/client';
-import { getExpiringAnnouncements } from './announcements-service';
+import { announcementService } from './announcements-service';
 import { SSO } from './sso-service';
 import emailService from '../../external/services/ches';
 import { config } from '../../config';
@@ -50,7 +50,7 @@ const schedulerService = {
   async sendAnnouncementExpiringEmails() {
     if (!config.get('server:enableEmailExpiringAnnouncements')) return;
 
-    const expiring = await getExpiringAnnouncements();
+    const expiring = await announcementService.getExpiringAnnouncements();
     if (!expiring.length) return;
 
     const sso = await SSO.init();
diff --git a/backend/src/v1/services/utils-service.ts b/backend/src/v1/services/utils-service.ts
index 1f48e205f..9daa25601 100644
--- a/backend/src/v1/services/utils-service.ts
+++ b/backend/src/v1/services/utils-service.ts
@@ -5,7 +5,6 @@ import jsonwebtoken from 'jsonwebtoken';
 import { config } from '../../config';
 import { logger as log, logger } from '../../logger';
 
-const fs = require('fs');
 axios.interceptors.response.use((response) => {
   const headers = response.headers;
   if (headers && headers['x-correlation-id']) {
diff --git a/charts/fin-pay-transparency/templates/secret.yaml b/charts/fin-pay-transparency/templates/secret.yaml
index c4c214a75..6de223119 100644
--- a/charts/fin-pay-transparency/templates/secret.yaml
+++ b/charts/fin-pay-transparency/templates/secret.yaml
@@ -56,9 +56,7 @@ data:
   ENTRA_APP_TENANT_ID: {{ .Values.global.secrets.entraTenantId | b64enc | quote }}
   BACKEND_POWERBI_URL: {{ .Values.global.secrets.powerBiUrl | b64enc | quote }}
   POWERBI_ANALYTICS_WORKSPACE_ID: {{ .Values.global.secrets.powerBiAnalyticsWorkspaceId | b64enc | quote }}
-  POWERBI_ANALYTICS_SUBMISSIONANALYTICS_ID: {{ .Values.global.secrets.powerBiAnalyticsSubmissionAnalyticsId | b64enc | quote }}
-  POWERBI_ANALYTICS_USERBEHAVIOUR_ID: {{ .Values.global.secrets.powerBiAnalyticsUserBehaviourId | b64enc | quote }}
-  POWERBI_ANALYTICS_DATAANALYTICS_ID: {{ .Values.global.secrets.powerBiAnalyticsDataAnalyticsId | b64enc | quote }}
+  POWERBI_ANALYTICS_REPORT_ID: {{ .Values.global.secrets.powerBiAnalyticsReportId | b64enc | quote }}
   S3_ACCESS_KEY_ID: {{ .Values.global.secrets.s3AccessKeyId | b64enc | quote }}
   S3_SECRET_ACCESS_KEY: {{ .Values.global.secrets.s3SecretAccessKey | b64enc | quote }}
   S3_BUCKET_NAME: {{ .Values.global.secrets.s3Bucket | b64enc | quote }}
diff --git a/clamav-service/clamav/Dockerfile b/clamav-service/clamav/Dockerfile
index 0d8fe44e8..01d876446 100644
--- a/clamav-service/clamav/Dockerfile
+++ b/clamav-service/clamav/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/ubi:9.4-1214.1725849297
+FROM registry.access.redhat.com/ubi9/ubi:9.4-1214.1726694543
 ARG VERSION=1.0.5
 
 LABEL name="ubi8-clamav" \