diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
new file mode 100644
index 000000000..194b0c659
--- /dev/null
+++ b/.github/workflows/pull-request.yml
@@ -0,0 +1,16 @@
+name: pull-request
+on:
+  pull_request:
+    branches: [main, staging, release/**]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - name: Install modules
+        run: yarn
+      - name: Test
+        run: yarn run jest --ci
diff --git a/.jest/setEnvVars.js b/.jest/setEnvVars.js
index f148eb1be..8d2b37bde 100644
--- a/.jest/setEnvVars.js
+++ b/.jest/setEnvVars.js
@@ -1,2 +1,2 @@
 process.env.NODE_ENV = "test";
-process.env.NEXT_PUBLIC_API_BASE_URL = "https://test.wrirestorationmarketplace.cubeapis.com";
+process.env.NEXT_PUBLIC_API_BASE_URL = "https://new-wri-staging.wri-restoration-marketplace-api.com";
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..603606bc9
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+18.17.0
diff --git a/src/admin/components/ResourceTabs/InformationTab/components/ProjectInformationAside/HighLevelMetrics.tsx b/src/admin/components/ResourceTabs/InformationTab/components/ProjectInformationAside/HighLevelMetrics.tsx
index d7b65969d..ee72b1cfe 100644
--- a/src/admin/components/ResourceTabs/InformationTab/components/ProjectInformationAside/HighLevelMetrics.tsx
+++ b/src/admin/components/ResourceTabs/InformationTab/components/ProjectInformationAside/HighLevelMetrics.tsx
@@ -26,7 +26,10 @@ const HighLevelMetics: FC = () => {
           </Labeled>
         </When>
         <When condition={record?.framework_key === "ppc"}>
-          <Labeled label="Workdays Created" sx={inlineLabelSx}>
+          <Labeled label="Workdays Created (Old Calculation)" sx={inlineLabelSx}>
+            <NumberField source="self_reported_workday_count" emptyText="0" />
+          </Labeled>
+          <Labeled label="Workdays Created (New Calculation)" sx={inlineLabelSx}>
             <NumberField source="workday_count" emptyText="0" />
           </Labeled>
         </When>
diff --git a/src/admin/components/ResourceTabs/InformationTab/components/SiteInformationAside/HighLevelMetrics.tsx b/src/admin/components/ResourceTabs/InformationTab/components/SiteInformationAside/HighLevelMetrics.tsx
index a3482f7b2..7243c8210 100644
--- a/src/admin/components/ResourceTabs/InformationTab/components/SiteInformationAside/HighLevelMetrics.tsx
+++ b/src/admin/components/ResourceTabs/InformationTab/components/SiteInformationAside/HighLevelMetrics.tsx
@@ -22,7 +22,10 @@ const HighLevelMetics: FC = () => {
             High Level Metrics
           </Text>
           <When condition={isPPC}>
-            <Labeled label="Total Number Of Workdays Created" sx={inlineLabelSx} className="label-field-aside">
+            <Labeled label="Workdays Created (Old Calculation)" sx={inlineLabelSx}>
+              <NumberField source="self_reported_workday_count" emptyText="0" />
+            </Labeled>
+            <Labeled label="Workdays Created (New Calculation)" sx={inlineLabelSx}>
               <NumberField source="workday_count" emptyText="0" />
             </Labeled>
           </When>
diff --git a/src/admin/modules/nurseries/components/NurseriesList.tsx b/src/admin/modules/nurseries/components/NurseriesList.tsx
index 0465fe5d2..17f64de3a 100644
--- a/src/admin/modules/nurseries/components/NurseriesList.tsx
+++ b/src/admin/modules/nurseries/components/NurseriesList.tsx
@@ -1,10 +1,11 @@
 import { Divider, Stack, Typography } from "@mui/material";
-import { FC, useState } from "react";
+import { FC } from "react";
 import {
   AutocompleteInput,
   Datagrid,
   DateField,
   EditButton,
+  FunctionField,
   List,
   ReferenceInput,
   SearchInput,
@@ -19,15 +20,17 @@ import ListActions from "@/admin/components/Actions/ListActions";
 import ExportProcessingAlert from "@/admin/components/Alerts/ExportProcessingAlert";
 import CustomBulkDeleteWithConfirmButton from "@/admin/components/Buttons/CustomBulkDeleteWithConfirmButton";
 import CustomDeleteWithConfirmButton from "@/admin/components/Buttons/CustomDeleteWithConfirmButton";
+import FrameworkSelectionDialog, { useFrameworkExport } from "@/admin/components/Dialogs/FrameworkSelectionDialog";
 import { getCountriesOptions } from "@/constants/options/countries";
+import { useFrameworkChoices } from "@/constants/options/frameworks";
 import { getChangeRequestStatusOptions, getStatusOptions } from "@/constants/options/status";
-import { fetchGetV2AdminENTITYExportFRAMEWORK } from "@/generated/apiComponents";
-import { downloadFileBlob } from "@/utils/network";
 import { optionToChoices } from "@/utils/options";
 
 import modules from "../..";
 
 const NurseryDataGrid: FC = () => {
+  const frameworkChoices = useFrameworkChoices();
+
   return (
     <Datagrid bulkActionButtons={<CustomBulkDeleteWithConfirmButton source="name" />}>
       <TextField source="name" label="Nursery Name" />
@@ -41,6 +44,15 @@ const NurseryDataGrid: FC = () => {
       <TextField source="project.name" label="Project Name" />
       <TextField source="organisation.name" label="Organization" />
       <DateField source="start_date" label="Establishment" locales="en-GB" />
+      <FunctionField
+        source="framework_key"
+        label="Framework"
+        render={(record: any) =>
+          frameworkChoices.find((framework: any) => framework.id === record?.framework_key)?.name ??
+          record?.framework_key
+        }
+        sortable={false}
+      />
       <ShowButton />
       <EditButton />
       <WrapperField>
@@ -51,7 +63,7 @@ const NurseryDataGrid: FC = () => {
 };
 
 export const NurseriesList: FC = () => {
-  const [exporting, setExporting] = useState<boolean>(false);
+  const frameworkChoices = useFrameworkChoices();
 
   const filters = [
     <SearchInput key="search" source="search" alwaysOn />,
@@ -68,6 +80,7 @@ export const NurseriesList: FC = () => {
     >
       <AutocompleteInput optionText="name" label="Organization" />
     </ReferenceInput>,
+    <SelectInput key="framework_key" label="Framework" source="framework_key" choices={frameworkChoices} />,
     <SelectInput key="status" label="Status" source="status" choices={optionToChoices(getStatusOptions())} />,
     <SelectInput
       key="update_request_status"
@@ -89,20 +102,7 @@ export const NurseriesList: FC = () => {
     </ReferenceInput>
   ];
 
-  const handleExport = () => {
-    setExporting(true);
-
-    fetchGetV2AdminENTITYExportFRAMEWORK({
-      pathParams: {
-        entity: "nurseries",
-        framework: "terrafund"
-      }
-    })
-      .then((response: any) => {
-        downloadFileBlob(response, "Nurseries - terrafund.csv");
-      })
-      .finally(() => setExporting(false));
-  };
+  const { exporting, openExportDialog, frameworkDialogProps } = useFrameworkExport("nurseries");
 
   return (
     <>
@@ -112,10 +112,12 @@ export const NurseriesList: FC = () => {
         <Divider />
       </Stack>
 
-      <List actions={<ListActions onExport={handleExport} />} filters={filters}>
+      <List actions={<ListActions onExport={openExportDialog} />} filters={filters}>
         <NurseryDataGrid />
       </List>
 
+      <FrameworkSelectionDialog {...frameworkDialogProps} />
+
       <ExportProcessingAlert show={exporting} />
     </>
   );
diff --git a/src/admin/modules/nurseryReports/components/NurseryReportsList.tsx b/src/admin/modules/nurseryReports/components/NurseryReportsList.tsx
index f4c14d185..15c08c148 100644
--- a/src/admin/modules/nurseryReports/components/NurseryReportsList.tsx
+++ b/src/admin/modules/nurseryReports/components/NurseryReportsList.tsx
@@ -1,10 +1,11 @@
 import { Divider, Stack, Typography } from "@mui/material";
-import { FC, useState } from "react";
+import { FC } from "react";
 import {
   AutocompleteInput,
   Datagrid,
   DateField,
   EditButton,
+  FunctionField,
   List,
   ReferenceInput,
   SearchInput,
@@ -17,15 +18,17 @@ import {
 import ListActions from "@/admin/components/Actions/ListActions";
 import ExportProcessingAlert from "@/admin/components/Alerts/ExportProcessingAlert";
 import CustomBulkDeleteWithConfirmButton from "@/admin/components/Buttons/CustomBulkDeleteWithConfirmButton";
+import FrameworkSelectionDialog, { useFrameworkExport } from "@/admin/components/Dialogs/FrameworkSelectionDialog";
 import { getCountriesOptions } from "@/constants/options/countries";
+import { useFrameworkChoices } from "@/constants/options/frameworks";
 import { getChangeRequestStatusOptions, getReportStatusOptions } from "@/constants/options/status";
-import { fetchGetV2AdminENTITYExportFRAMEWORK } from "@/generated/apiComponents";
-import { downloadFileBlob } from "@/utils/network";
 import { optionToChoices } from "@/utils/options";
 
 import modules from "../..";
 
 const NurseryReportDataGrid: FC = () => {
+  const frameworkChoices = useFrameworkChoices();
+
   return (
     <Datagrid bulkActionButtons={<CustomBulkDeleteWithConfirmButton source="title" />}>
       <TextField source="nursery.name" label="Nursery Name" sortable={false} />
@@ -41,6 +44,15 @@ const NurseryReportDataGrid: FC = () => {
       <DateField source="due_at" label="Due Date" locales="en-GB" />
       <DateField source="updated_at" label="Last Updated" locales="en-GB" />
       <DateField source="submitted_at" label="Date Submitted" locales="en-GB" />
+      <FunctionField
+        source="framework_key"
+        label="Framework"
+        render={(record: any) =>
+          frameworkChoices.find((framework: any) => framework.id === record?.framework_key)?.name ??
+          record?.framework_key
+        }
+        sortable={false}
+      />
       <ShowButton />
       <EditButton />
     </Datagrid>
@@ -48,7 +60,7 @@ const NurseryReportDataGrid: FC = () => {
 };
 
 export const NurseryReportsList: FC = () => {
-  const [exporting, setExporting] = useState<boolean>(false);
+  const frameworkChoices = useFrameworkChoices();
 
   const filters = [
     <SearchInput key="search" source="search" alwaysOn />,
@@ -77,6 +89,7 @@ export const NurseryReportsList: FC = () => {
       <AutocompleteInput optionText="name" label="Nursery" />
     </ReferenceInput>,
     <SelectInput key="country" label="Country" source="country" choices={optionToChoices(getCountriesOptions())} />,
+    <SelectInput key="framework_key" label="Framework" source="framework_key" choices={frameworkChoices} />,
     <SelectInput key="status" label="Status" source="status" choices={optionToChoices(getReportStatusOptions())} />,
     <SelectInput
       key="update_request_status"
@@ -86,20 +99,7 @@ export const NurseryReportsList: FC = () => {
     />
   ];
 
-  const handleExport = () => {
-    setExporting(true);
-
-    fetchGetV2AdminENTITYExportFRAMEWORK({
-      pathParams: {
-        entity: "nursery-reports",
-        framework: "terrafund"
-      }
-    })
-      .then((response: any) => {
-        downloadFileBlob(response, "Nursery Reports - terrafund.csv");
-      })
-      .finally(() => setExporting(false));
-  };
+  const { exporting, openExportDialog, frameworkDialogProps } = useFrameworkExport("nursery-reports");
 
   return (
     <>
@@ -109,10 +109,12 @@ export const NurseryReportsList: FC = () => {
         <Divider />
       </Stack>
 
-      <List actions={<ListActions onExport={handleExport} />} filters={filters}>
+      <List actions={<ListActions onExport={openExportDialog} />} filters={filters}>
         <NurseryReportDataGrid />
       </List>
 
+      <FrameworkSelectionDialog {...frameworkDialogProps} />
+
       <ExportProcessingAlert show={exporting} />
     </>
   );
diff --git a/src/components/elements/Cards/FundingCard/__snapshots__/FundingCard.stories.storyshot b/src/components/elements/Cards/FundingCard/__snapshots__/FundingCard.stories.storyshot
index d64d5ab9f..5ea8b0618 100644
--- a/src/components/elements/Cards/FundingCard/__snapshots__/FundingCard.stories.storyshot
+++ b/src/components/elements/Cards/FundingCard/__snapshots__/FundingCard.stories.storyshot
@@ -41,7 +41,7 @@ exports[`Storyshots Components/Elements/Cards/FundingCard Default 1`] = `
         Location:
       </p>
       <p
-        className="text-light-caption-200"
+        className="max-h-10 overflow-hidden text-light-caption-200"
         data-testid="txt"
       >
         London, United Kingdom
@@ -54,10 +54,10 @@ exports[`Storyshots Components/Elements/Cards/FundingCard Default 1`] = `
       The funding application is designed for restoration projects in Africa. This application provides an opportunity for project developers to seek financial support for their restoration initiatives across the African continent.
     </p>
     <div
-      className="mt-8 flex gap-3"
+      className="mt-4 flex flex-col gap-3 sm:flex-row"
     >
       <a
-        className="flex-1 bg-white border border-neutral-1000 hover:border-primary-500 disabled:border-neutral-1000 py-1.75 rounded-md px-10 uppercase disabled:bg-neutral-300 disabled:text-neutral-800 transition whitespace-nowrap text-black h-8 flex items-center justify-center gap-1.5 tracking-wide w-fit-content"
+        className="w-full flex-1 bg-white border border-neutral-1000 hover:border-primary-500 disabled:border-neutral-1000 py-1.75 rounded-md px-10 uppercase disabled:bg-neutral-300 disabled:text-neutral-800 transition whitespace-nowrap text-black h-8 flex items-center justify-center gap-1.5 tracking-wide w-fit-content"
         disabled={false}
         href="#"
         onClick={[Function]}
@@ -80,7 +80,7 @@ exports[`Storyshots Components/Elements/Cards/FundingCard Default 1`] = `
         </span>
       </a>
       <a
-        className="flex-1 bg-primary-500 hover:bg-primary-400 py-2 rounded-md px-10 uppercase disabled:bg-neutral-300 disabled:text-neutral-800 transition whitespace-nowrap text-black h-8 flex items-center justify-center gap-1.5 tracking-wide w-fit-content"
+        className="w-full flex-1 bg-primary-500 hover:bg-primary-400 py-2 rounded-md px-10 uppercase disabled:bg-neutral-300 disabled:text-neutral-800 transition whitespace-nowrap text-black h-8 flex items-center justify-center gap-1.5 tracking-wide w-fit-content"
         disabled={false}
         href="#"
         onClick={[Function]}
diff --git a/src/components/elements/Cards/ProjectCard/ProjectCard.tsx b/src/components/elements/Cards/ProjectCard/ProjectCard.tsx
index 1241271b6..cfc7d0f1a 100644
--- a/src/components/elements/Cards/ProjectCard/ProjectCard.tsx
+++ b/src/components/elements/Cards/ProjectCard/ProjectCard.tsx
@@ -56,6 +56,12 @@ const ProjectCard = ({ project, onDelete, title, children, className, ...rest }:
     );
   };
 
+  const frameworkNames: { [key: string]: string } = {
+    ppc: "Priceless Planet Coalition",
+    hbf: "Harit Bharat Fund",
+    terrafund: "TerraFund"
+  };
+
   return (
     <Paper {...rest} className={classNames(className, "p-0")}>
       <div className="flex items-center gap-4 border-b border-neutral-100 px-8 py-6">
@@ -72,11 +78,7 @@ const ProjectCard = ({ project, onDelete, title, children, className, ...rest }:
           <div className="flex">
             <Text variant="text-bold-subtitle-500">{t("Framework")}:&#160;</Text>
             <Text variant="text-light-subtitle-400" className="capitalize">
-              {project.framework_key === "ppc"
-                ? t("Priceless Planet Coalition")
-                : project.framework_key === "terrafund"
-                ? t("TerraFund")
-                : project.framework_key}
+              {frameworkNames[project.framework_key] ? t(frameworkNames[project.framework_key]) : project.framework_key}
             </Text>
           </div>
           <div className="flex">
diff --git a/src/components/elements/ImageGallery/__snapshots__/ImageGallery.stories.storyshot b/src/components/elements/ImageGallery/__snapshots__/ImageGallery.stories.storyshot
index 5f71ff116..38fa4a4b6 100644
--- a/src/components/elements/ImageGallery/__snapshots__/ImageGallery.stories.storyshot
+++ b/src/components/elements/ImageGallery/__snapshots__/ImageGallery.stories.storyshot
@@ -31,6 +31,14 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
           >
             Show All
           </p>
+          <div
+            style={
+              Object {
+                "height": undefined,
+                "width": 20,
+              }
+            }
+          />
         </div>
       </div>
     </div>
@@ -69,6 +77,14 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
           <div
             className="flex justify-between p-3"
           >
+            <div
+              style={
+                Object {
+                  "height": 32,
+                  "width": 32,
+                }
+              }
+            />
             <div
               className="ml-auto flex items-center"
             >
@@ -79,11 +95,29 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
                 onMouseEnter={[Function]}
                 onTouchStart={[Function]}
                 target="_blank"
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </a>
               <button
                 className="flex items-center justify-center rounded-full hover:bg-opacity-60 z-10"
                 onClick={[Function]}
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </button>
             </div>
           </div>
         </div>
@@ -144,11 +178,29 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
                 onMouseEnter={[Function]}
                 onTouchStart={[Function]}
                 target="_blank"
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </a>
               <button
                 className="flex items-center justify-center rounded-full hover:bg-opacity-60 z-10"
                 onClick={[Function]}
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </button>
             </div>
           </div>
         </div>
@@ -209,11 +261,29 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
                 onMouseEnter={[Function]}
                 onTouchStart={[Function]}
                 target="_blank"
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </a>
               <button
                 className="flex items-center justify-center rounded-full hover:bg-opacity-60 z-10"
                 onClick={[Function]}
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </button>
             </div>
           </div>
         </div>
@@ -264,6 +334,14 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
           <div
             className="flex justify-between p-3"
           >
+            <div
+              style={
+                Object {
+                  "height": 32,
+                  "width": 32,
+                }
+              }
+            />
             <div
               className="ml-auto flex items-center"
             >
@@ -274,11 +352,29 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
                 onMouseEnter={[Function]}
                 onTouchStart={[Function]}
                 target="_blank"
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </a>
               <button
                 className="flex items-center justify-center rounded-full hover:bg-opacity-60 z-10"
                 onClick={[Function]}
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </button>
             </div>
           </div>
         </div>
@@ -339,11 +435,29 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
                 onMouseEnter={[Function]}
                 onTouchStart={[Function]}
                 target="_blank"
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </a>
               <button
                 className="flex items-center justify-center rounded-full hover:bg-opacity-60 z-10"
                 onClick={[Function]}
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </button>
             </div>
           </div>
         </div>
@@ -394,6 +508,14 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
           <div
             className="flex justify-between p-3"
           >
+            <div
+              style={
+                Object {
+                  "height": 32,
+                  "width": 32,
+                }
+              }
+            />
             <div
               className="ml-auto flex items-center"
             >
@@ -404,11 +526,29 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
                 onMouseEnter={[Function]}
                 onTouchStart={[Function]}
                 target="_blank"
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </a>
               <button
                 className="flex items-center justify-center rounded-full hover:bg-opacity-60 z-10"
                 onClick={[Function]}
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </button>
             </div>
           </div>
         </div>
@@ -469,11 +609,29 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
                 onMouseEnter={[Function]}
                 onTouchStart={[Function]}
                 target="_blank"
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </a>
               <button
                 className="flex items-center justify-center rounded-full hover:bg-opacity-60 z-10"
                 onClick={[Function]}
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </button>
             </div>
           </div>
         </div>
@@ -534,11 +692,29 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
                 onMouseEnter={[Function]}
                 onTouchStart={[Function]}
                 target="_blank"
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </a>
               <button
                 className="flex items-center justify-center rounded-full hover:bg-opacity-60 z-10"
                 onClick={[Function]}
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </button>
             </div>
           </div>
         </div>
@@ -589,6 +765,14 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
           <div
             className="flex justify-between p-3"
           >
+            <div
+              style={
+                Object {
+                  "height": 32,
+                  "width": 32,
+                }
+              }
+            />
             <div
               className="ml-auto flex items-center"
             >
@@ -599,11 +783,29 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
                 onMouseEnter={[Function]}
                 onTouchStart={[Function]}
                 target="_blank"
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </a>
               <button
                 className="flex items-center justify-center rounded-full hover:bg-opacity-60 z-10"
                 onClick={[Function]}
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </button>
             </div>
           </div>
         </div>
@@ -654,6 +856,14 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
           <div
             className="flex justify-between p-3"
           >
+            <div
+              style={
+                Object {
+                  "height": 32,
+                  "width": 32,
+                }
+              }
+            />
             <div
               className="ml-auto flex items-center"
             >
@@ -664,11 +874,29 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
                 onMouseEnter={[Function]}
                 onTouchStart={[Function]}
                 target="_blank"
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </a>
               <button
                 className="flex items-center justify-center rounded-full hover:bg-opacity-60 z-10"
                 onClick={[Function]}
-              />
+              >
+                <div
+                  style={
+                    Object {
+                      "height": 32,
+                      "width": 32,
+                    }
+                  }
+                />
+              </button>
             </div>
           </div>
         </div>
@@ -723,7 +951,16 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
           </div>
           <div
             className="flex h-full flex-1 items-center justify-center rounded-r-lg bg-primary-200"
-          />
+          >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 20,
+                }
+              }
+            />
+          </div>
         </div>
         <p
           className="text-bold-subtitle-500"
@@ -746,7 +983,16 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
         className="flex items-center justify-center rounded-full hover:bg-opacity-60"
         disabled={true}
         onClick={[Function]}
-      />
+      >
+        <div
+          style={
+            Object {
+              "height": undefined,
+              "width": 20,
+            }
+          }
+        />
+      </button>
       <p
         className="text-neutral-1000 underline text-bold-subtitle-500"
         data-testid="txt"
@@ -769,7 +1015,16 @@ exports[`Storyshots Components/Elements/ImageGallery Default 1`] = `
         className="flex items-center justify-center rounded-full hover:bg-opacity-60"
         disabled={false}
         onClick={[Function]}
-      />
+      >
+        <div
+          style={
+            Object {
+              "height": undefined,
+              "width": 20,
+            }
+          }
+        />
+      </button>
     </div>
   </div>
 </div>
diff --git a/src/components/elements/Inputs/BooleanInput/__snapshots__/BooleanInput.stories.storyshot b/src/components/elements/Inputs/BooleanInput/__snapshots__/BooleanInput.stories.storyshot
index 7cfac736f..dfc1cdbb4 100644
--- a/src/components/elements/Inputs/BooleanInput/__snapshots__/BooleanInput.stories.storyshot
+++ b/src/components/elements/Inputs/BooleanInput/__snapshots__/BooleanInput.stories.storyshot
@@ -53,6 +53,7 @@ exports[`Storyshots Components/Elements/Inputs/BooleanInput Default 1`] = `
             className="flex flex-row-reverse items-center justify-end gap-3 "
             id=":re:"
             label="Yes"
+            onChange={[Function]}
             type="radio"
           />
         </label>
@@ -86,6 +87,7 @@ exports[`Storyshots Components/Elements/Inputs/BooleanInput Default 1`] = `
             className="flex flex-row-reverse items-center justify-end gap-3 "
             id=":rg:"
             label="No"
+            onChange={[Function]}
             type="radio"
           />
         </label>
diff --git a/src/components/elements/Inputs/ConditionalInput/ConditionalInput.stories.tsx b/src/components/elements/Inputs/ConditionalInput/ConditionalInput.stories.tsx
index 1e9d57f16..c5e99b25d 100644
--- a/src/components/elements/Inputs/ConditionalInput/ConditionalInput.stories.tsx
+++ b/src/components/elements/Inputs/ConditionalInput/ConditionalInput.stories.tsx
@@ -16,7 +16,8 @@ type Story = StoryObj<typeof Component>;
 export const Default: Story = {
   render: args => {
     const formHook = useForm();
-    return <Component {...args} control={formHook.control} formHook={formHook} />;
+    const onChangeCapture = () => {};
+    return <Component {...args} control={formHook.control} formHook={formHook} onChangeCapture={onChangeCapture} />;
   },
   args: {
     name: "conditional-field",
diff --git a/src/components/elements/Inputs/ConditionalInput/__snapshots__/ConditionalInput.stories.storyshot b/src/components/elements/Inputs/ConditionalInput/__snapshots__/ConditionalInput.stories.storyshot
index b8b201302..aa443fce1 100644
--- a/src/components/elements/Inputs/ConditionalInput/__snapshots__/ConditionalInput.stories.storyshot
+++ b/src/components/elements/Inputs/ConditionalInput/__snapshots__/ConditionalInput.stories.storyshot
@@ -54,6 +54,7 @@ Array [
               className="flex flex-row-reverse items-center justify-end gap-3 "
               id=":rl:"
               label="Yes"
+              onChange={[Function]}
               type="radio"
             />
           </label>
@@ -87,6 +88,7 @@ Array [
               className="flex flex-row-reverse items-center justify-end gap-3 "
               id=":rn:"
               label="No"
+              onChange={[Function]}
               type="radio"
             />
           </label>
diff --git a/src/components/elements/Inputs/Dropdown/__snapshots__/Dropdown.stories.storyshot b/src/components/elements/Inputs/Dropdown/__snapshots__/Dropdown.stories.storyshot
index 7afb98a12..48ed83dc6 100644
--- a/src/components/elements/Inputs/Dropdown/__snapshots__/Dropdown.stories.storyshot
+++ b/src/components/elements/Inputs/Dropdown/__snapshots__/Dropdown.stories.storyshot
@@ -42,6 +42,14 @@ exports[`Storyshots Components/Elements/Inputs/Dropdown Multi Select 1`] = `
       >
         placeholder
       </span>
+      <div
+        style={
+          Object {
+            "height": undefined,
+            "width": 16,
+          }
+        }
+      />
     </div>
   </div>
 </div>
@@ -89,6 +97,14 @@ exports[`Storyshots Components/Elements/Inputs/Dropdown Multi Select With Other
       >
         placeholder
       </span>
+      <div
+        style={
+          Object {
+            "height": undefined,
+            "width": 16,
+          }
+        }
+      />
     </div>
   </div>
 </div>
@@ -136,6 +152,14 @@ exports[`Storyshots Components/Elements/Inputs/Dropdown Single Select 1`] = `
       >
         placeholder
       </span>
+      <div
+        style={
+          Object {
+            "height": undefined,
+            "width": 16,
+          }
+        }
+      />
     </div>
   </div>
 </div>
@@ -183,6 +207,14 @@ exports[`Storyshots Components/Elements/Inputs/Dropdown Single Select With Other
       >
         placeholder
       </span>
+      <div
+        style={
+          Object {
+            "height": undefined,
+            "width": 16,
+          }
+        }
+      />
     </div>
   </div>
 </div>
diff --git a/src/components/elements/Inputs/InputElements/InputLabel.tsx b/src/components/elements/Inputs/InputElements/InputLabel.tsx
index 17e50defa..1248094c8 100644
--- a/src/components/elements/Inputs/InputElements/InputLabel.tsx
+++ b/src/components/elements/Inputs/InputElements/InputLabel.tsx
@@ -1,7 +1,7 @@
 import { useT } from "@transifex/react";
 import classNames from "classnames";
 import { isNumber } from "lodash";
-import { HTMLProps } from "react";
+import { forwardRef, HTMLProps, RefObject } from "react";
 import { When } from "react-if";
 
 import StatusPill from "@/components/elements/StatusPill/StatusPill";
@@ -16,7 +16,7 @@ export interface InputLabelProps extends HTMLProps<HTMLLabelElement> {
   suffixLabelView?: boolean;
 }
 
-const InputLabel = (props: InputLabelProps) => {
+export default forwardRef(function InputLabel(props: InputLabelProps, ref) {
   const t = useT();
   const {
     feedbackRequired,
@@ -32,6 +32,7 @@ const InputLabel = (props: InputLabelProps) => {
     <When condition={!!props.children}>
       <Text<HTMLLabelElement>
         {...labelProps}
+        ref={ref as RefObject<HTMLLabelElement>}
         as="label"
         variant={labelVariant ?? "text-bold-body-300"}
         className={classNames("mr-2 inline uppercase", className)}
@@ -46,6 +47,4 @@ const InputLabel = (props: InputLabelProps) => {
       </When>
     </When>
   );
-};
-
-export default InputLabel;
+});
diff --git a/src/components/elements/Inputs/LanguageDropdown/__snapshots__/LanguagesDropdown.stories.storyshot b/src/components/elements/Inputs/LanguageDropdown/__snapshots__/LanguagesDropdown.stories.storyshot
index 62b79263b..aaa73a5c6 100644
--- a/src/components/elements/Inputs/LanguageDropdown/__snapshots__/LanguagesDropdown.stories.storyshot
+++ b/src/components/elements/Inputs/LanguageDropdown/__snapshots__/LanguagesDropdown.stories.storyshot
@@ -19,11 +19,27 @@ exports[`Storyshots Components/Elements/Inputs/LanguagesDropdown Default 1`] = `
       onMouseDown={[Function]}
       type="button"
     >
+      <div
+        style={
+          Object {
+            "height": undefined,
+            "width": 16,
+          }
+        }
+      />
       <span
         className="mr-2 whitespace-nowrap text-sm uppercase text-neutral-900"
       >
         English
       </span>
+      <div
+        style={
+          Object {
+            "height": undefined,
+            "width": 8,
+          }
+        }
+      />
     </button>
   </div>
 </div>
diff --git a/src/components/elements/Inputs/RadioGroup/__snapshots__/RadioGroup.stories.storyshot b/src/components/elements/Inputs/RadioGroup/__snapshots__/RadioGroup.stories.storyshot
index fb42745a4..11a8a76e6 100644
--- a/src/components/elements/Inputs/RadioGroup/__snapshots__/RadioGroup.stories.storyshot
+++ b/src/components/elements/Inputs/RadioGroup/__snapshots__/RadioGroup.stories.storyshot
@@ -44,6 +44,7 @@ exports[`Storyshots Components/Elements/Inputs/RadioGroup Default 1`] = `
             className="flex flex-row-reverse items-center justify-end gap-3 "
             id=":r1g:"
             label="Yes"
+            onChange={[Function]}
             type="radio"
           />
         </label>
@@ -77,6 +78,7 @@ exports[`Storyshots Components/Elements/Inputs/RadioGroup Default 1`] = `
             className="flex flex-row-reverse items-center justify-end gap-3 "
             id=":r1i:"
             label="No"
+            onChange={[Function]}
             type="radio"
           />
         </label>
diff --git a/src/components/elements/LandingPage/__snapshots__/AlternatingSection.stories.storyshot b/src/components/elements/LandingPage/__snapshots__/AlternatingSection.stories.storyshot
index d505d787e..6aabb122e 100644
--- a/src/components/elements/LandingPage/__snapshots__/AlternatingSection.stories.storyshot
+++ b/src/components/elements/LandingPage/__snapshots__/AlternatingSection.stories.storyshot
@@ -44,7 +44,7 @@ exports[`Storyshots Components/Elements/LandingPage/AlternatingSection Left 1`]
     className="flex justify-center bg-background md:w-[50%]"
   >
     <div
-      className="relative h-[278px] w-full md:h-[472px]"
+      className="relative h-[278px] w-full md:h-[510px]"
     >
       <img
         alt="image"
@@ -122,7 +122,7 @@ exports[`Storyshots Components/Elements/LandingPage/AlternatingSection Right 1`]
     className="flex justify-center bg-background md:w-[50%]"
   >
     <div
-      className="relative h-[278px] w-full md:h-[472px]"
+      className="relative h-[278px] w-full md:h-[510px]"
     >
       <img
         alt="image"
diff --git a/src/components/elements/SelectImageList/__snapshots__/SelectImageList.stories.storyshot b/src/components/elements/SelectImageList/__snapshots__/SelectImageList.stories.storyshot
index c5cb669b3..9ad872d18 100644
--- a/src/components/elements/SelectImageList/__snapshots__/SelectImageList.stories.storyshot
+++ b/src/components/elements/SelectImageList/__snapshots__/SelectImageList.stories.storyshot
@@ -12,7 +12,7 @@ exports[`Storyshots Components/Elements/SelectImageList Condensed 1`] = `
         className="aspect-square h-[6.375rem] rounded-lg bg-cover bg-center transition-all duration-200"
         style={
           Object {
-            "backgroundImage": "url('https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/no_poverty@2x.png')",
+            "backgroundImage": "url('https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/no_poverty@2x.png')",
           }
         }
       />
@@ -32,7 +32,7 @@ exports[`Storyshots Components/Elements/SelectImageList Condensed 1`] = `
         className="aspect-square h-[6.375rem] rounded-lg bg-cover bg-center transition-all duration-200"
         style={
           Object {
-            "backgroundImage": "url('https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/good-health-and-well-being@2x.png')",
+            "backgroundImage": "url('https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/good-health-and-well-being@2x.png')",
           }
         }
       />
@@ -52,7 +52,7 @@ exports[`Storyshots Components/Elements/SelectImageList Condensed 1`] = `
         className="aspect-square h-[6.375rem] rounded-lg bg-cover bg-center transition-all duration-200"
         style={
           Object {
-            "backgroundImage": "url('https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/quality-education@2x.png')",
+            "backgroundImage": "url('https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/quality-education@2x.png')",
           }
         }
       />
@@ -72,7 +72,7 @@ exports[`Storyshots Components/Elements/SelectImageList Condensed 1`] = `
         className="aspect-square h-[6.375rem] rounded-lg bg-cover bg-center transition-all duration-200"
         style={
           Object {
-            "backgroundImage": "url('https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/affordable-and-clean-energy@2x.png')",
+            "backgroundImage": "url('https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/affordable-and-clean-energy@2x.png')",
           }
         }
       />
@@ -92,7 +92,7 @@ exports[`Storyshots Components/Elements/SelectImageList Condensed 1`] = `
         className="aspect-square h-[6.375rem] rounded-lg bg-cover bg-center transition-all duration-200"
         style={
           Object {
-            "backgroundImage": "url('https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/climate-action@2x.png')",
+            "backgroundImage": "url('https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/climate-action@2x.png')",
           }
         }
       />
@@ -119,7 +119,7 @@ exports[`Storyshots Components/Elements/SelectImageList Default 1`] = `
         className="border-4 border-neutral-900 aspect-square h-[6.375rem] rounded-lg bg-cover bg-center transition-all duration-200"
         style={
           Object {
-            "backgroundImage": "url('https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/no_poverty@2x.png')",
+            "backgroundImage": "url('https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/no_poverty@2x.png')",
           }
         }
       />
@@ -139,7 +139,7 @@ exports[`Storyshots Components/Elements/SelectImageList Default 1`] = `
         className="border-4 border-neutral-900 aspect-square h-[6.375rem] rounded-lg bg-cover bg-center transition-all duration-200"
         style={
           Object {
-            "backgroundImage": "url('https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/good-health-and-well-being@2x.png')",
+            "backgroundImage": "url('https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/good-health-and-well-being@2x.png')",
           }
         }
       />
@@ -159,7 +159,7 @@ exports[`Storyshots Components/Elements/SelectImageList Default 1`] = `
         className="border-4 border-neutral-900 aspect-square h-[6.375rem] rounded-lg bg-cover bg-center transition-all duration-200"
         style={
           Object {
-            "backgroundImage": "url('https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/quality-education@2x.png')",
+            "backgroundImage": "url('https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/quality-education@2x.png')",
           }
         }
       />
@@ -179,7 +179,7 @@ exports[`Storyshots Components/Elements/SelectImageList Default 1`] = `
         className="border-4 border-neutral-900 aspect-square h-[6.375rem] rounded-lg bg-cover bg-center transition-all duration-200"
         style={
           Object {
-            "backgroundImage": "url('https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/affordable-and-clean-energy@2x.png')",
+            "backgroundImage": "url('https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/affordable-and-clean-energy@2x.png')",
           }
         }
       />
@@ -199,7 +199,7 @@ exports[`Storyshots Components/Elements/SelectImageList Default 1`] = `
         className="border-4 border-neutral-900 aspect-square h-[6.375rem] rounded-lg bg-cover bg-center transition-all duration-200"
         style={
           Object {
-            "backgroundImage": "url('https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/climate-action@2x.png')",
+            "backgroundImage": "url('https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/climate-action@2x.png')",
           }
         }
       />
diff --git a/src/components/elements/Table/__snapshots__/Table.stories.storyshot b/src/components/elements/Table/__snapshots__/Table.stories.storyshot
index 1d2763868..e2ef42969 100644
--- a/src/components/elements/Table/__snapshots__/Table.stories.storyshot
+++ b/src/components/elements/Table/__snapshots__/Table.stories.storyshot
@@ -13,6 +13,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
       <div
         className="w-64 relative"
       >
+        <div
+          style={
+            Object {
+              "height": undefined,
+              "width": 20,
+            }
+          }
+        />
         <input
           className="placeholder:text-light-subtitle-400 text-light-subtitle-400 h-8 w-full rounded-lg border border-neutral-100 pl-8 text-neutral-1000 placeholder:text-neutral-1000"
           onChange={[Function]}
@@ -57,6 +65,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
               >
                 Show All
               </p>
+              <div
+                style={
+                  Object {
+                    "height": undefined,
+                    "width": 20,
+                  }
+                }
+              />
             </div>
           </div>
         </div>
@@ -94,6 +110,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           onClick={[Function]}
         >
           Funding source
+          <div
+            style={
+              Object {
+                "height": 14,
+                "width": 11,
+              }
+            }
+          />
         </th>
         <th
           align="left"
@@ -102,6 +126,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           onClick={[Function]}
         >
           Funding amount
+          <div
+            style={
+              Object {
+                "height": 14,
+                "width": 11,
+              }
+            }
+          />
         </th>
         <th
           align="left"
@@ -150,6 +182,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           <div
             className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-error-200 w-fit"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 24,
+                }
+              }
+            />
             <p
               className="text-bold-caption-100"
               data-testid="txt"
@@ -201,6 +241,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           <div
             className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-primary-200 w-fit"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 24,
+                }
+              }
+            />
             <p
               className="text-bold-caption-100"
               data-testid="txt"
@@ -252,6 +300,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           <div
             className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-tertiary-200 w-fit"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 24,
+                }
+              }
+            />
             <p
               className="text-bold-caption-100"
               data-testid="txt"
@@ -303,6 +359,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           <div
             className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-error-200 w-fit"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 24,
+                }
+              }
+            />
             <p
               className="text-bold-caption-100"
               data-testid="txt"
@@ -354,6 +418,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           <div
             className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-neutral-200 w-fit"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 24,
+                }
+              }
+            />
             <p
               className="text-bold-caption-100"
               data-testid="txt"
@@ -405,6 +477,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           <div
             className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-secondary-200 w-fit"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 24,
+                }
+              }
+            />
             <p
               className="text-bold-caption-100"
               data-testid="txt"
@@ -456,6 +536,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           <div
             className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-error-200 w-fit"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 24,
+                }
+              }
+            />
             <p
               className="text-bold-caption-100"
               data-testid="txt"
@@ -507,6 +595,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           <div
             className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-primary-200 w-fit"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 24,
+                }
+              }
+            />
             <p
               className="text-bold-caption-100"
               data-testid="txt"
@@ -558,6 +654,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           <div
             className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-tertiary-200 w-fit"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 24,
+                }
+              }
+            />
             <p
               className="text-bold-caption-100"
               data-testid="txt"
@@ -609,6 +713,14 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           <div
             className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-secondary-200 w-fit"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 24,
+                }
+              }
+            />
             <p
               className="text-bold-caption-100"
               data-testid="txt"
@@ -668,7 +780,16 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
           </div>
           <div
             className="flex h-full flex-1 items-center justify-center rounded-r-lg bg-primary-200"
-          />
+          >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 20,
+                }
+              }
+            />
+          </div>
         </div>
         <p
           className="text-bold-subtitle-500"
@@ -692,7 +813,16 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
         className="flex items-center justify-center rounded-full hover:bg-opacity-60"
         disabled={true}
         onClick={[Function]}
-      />
+      >
+        <div
+          style={
+            Object {
+              "height": undefined,
+              "width": 20,
+            }
+          }
+        />
+      </button>
       <p
         className="text-neutral-1000 underline text-bold-subtitle-500"
         data-testid="txt"
@@ -715,7 +845,16 @@ exports[`Storyshots Components/Elements/Table Default 1`] = `
         className="flex items-center justify-center rounded-full hover:bg-opacity-60"
         disabled={false}
         onClick={[Function]}
-      />
+      >
+        <div
+          style={
+            Object {
+              "height": undefined,
+              "width": 20,
+            }
+          }
+        />
+      </button>
     </div>
   </div>
 </div>
diff --git a/src/components/elements/Tabs/Default/TabButton.tsx b/src/components/elements/Tabs/Default/TabButton.tsx
index 876496f3b..97e284389 100644
--- a/src/components/elements/Tabs/Default/TabButton.tsx
+++ b/src/components/elements/Tabs/Default/TabButton.tsx
@@ -1,5 +1,5 @@
 import classNames from "classnames";
-import { ButtonHTMLAttributes, DetailedHTMLProps } from "react";
+import { ButtonHTMLAttributes, DetailedHTMLProps, forwardRef } from "react";
 import { When } from "react-if";
 
 import Text from "@/components/elements/Text/Text";
@@ -16,39 +16,35 @@ export interface TabButtonProps extends DetailedHTMLProps<ButtonHTMLAttributes<H
   lastItem?: boolean;
 }
 
-export const TabButton = ({
-  index,
-  item,
-  lastItem,
-  selected,
-  className,
-  textVariant,
-  ...buttonProps
-}: TabButtonProps) => {
-  return (
-    <button
-      {...buttonProps}
-      role="option"
-      aria-selected={selected ? "true" : "false"}
-      aria-checked={item.done ? "true" : "false"}
-      className={classNames(
-        className,
-        "w-full items-center focus:outline-none disabled:text-neutral-900",
-        item.done && "peer",
-        lastItem,
-        selected
-          ? "border-l-4 border-l-[#27A9E0] bg-white text-neutral-1000"
-          : item.done
-          ? "border border-green-100  bg-green-50"
-          : "bg-[rgba(0, 0, 0, 0.03)] border-b-[rgba(0, 0, 0, 0.03)] border-l-4 border-b-2 border-white border-l-transparent text-neutral-900"
-      )}
-    >
-      <Text variant={textVariant} className="w-full text-left font-primary line-clamp-2 md:pr-6" containHtml>
-        {item.title}
-      </Text>
-      <When condition={item.done}>
-        <Icon className="text-green-100 " name={IconNames.APPROVED_COLORLESS} width={20} />
-      </When>
-    </button>
-  );
-};
+export const TabButton = forwardRef(
+  ({ index, item, lastItem, selected, className, textVariant, ...buttonProps }: TabButtonProps, ref) => {
+    // @ts-ignore
+    buttonProps["ref"] = ref;
+    return (
+      <button
+        {...buttonProps}
+        role="option"
+        aria-selected={selected ? "true" : "false"}
+        aria-checked={item.done ? "true" : "false"}
+        className={classNames(
+          className,
+          "w-full items-center focus:outline-none disabled:text-neutral-900",
+          item.done && "peer",
+          lastItem || selected ? "border-b" : "border-b-0",
+          selected
+            ? "border-neutral-100 border-r-white bg-white text-neutral-1000 peer-aria-checked:shadow-t-secondary"
+            : item.done
+            ? `border-secondary-500 bg-secondary-300 text-neutral-800  `
+            : `border-neutral-100 bg-neutral-300 text-neutral-900`
+        )}
+      >
+        <Text variant={textVariant} className="w-full text-left line-clamp-2 md:pr-6" containHtml>
+          {item.title}
+        </Text>
+        <When condition={item.done}>
+          <Icon className="text-green-100 " name={IconNames.APPROVED_COLORLESS} width={20} />
+        </When>
+      </button>
+    );
+  }
+);
diff --git a/src/components/elements/Text/Text.tsx b/src/components/elements/Text/Text.tsx
index 1d36ee0f7..0baac7c40 100644
--- a/src/components/elements/Text/Text.tsx
+++ b/src/components/elements/Text/Text.tsx
@@ -1,6 +1,6 @@
 import cn from "classnames";
 import _ from "lodash";
-import { HTMLProps, ReactNode } from "react";
+import { ForwardedRef, forwardRef, HTMLProps, LegacyRef, ReactElement, ReactNode } from "react";
 
 import { TextVariants } from "@/types/common";
 
@@ -13,7 +13,7 @@ export type TextProps<T = HTMLParagraphElement> = HTMLProps<T> & {
   capitalize?: boolean;
 };
 
-function Text<T>(props: TextProps<T>): JSX.Element {
+function Text<T>(props: TextProps<T>, ref: ForwardedRef<T>): JSX.Element {
   const { as: As, className, children, variant, capitalize, containHtml, ...rest } = props;
 
   const Component = As || "p";
@@ -23,6 +23,7 @@ function Text<T>(props: TextProps<T>): JSX.Element {
     return (
       <Component
         {...rest}
+        ref={ref}
         data-testid="txt"
         className={cn(className, variant, { "with-inner-html": containHtml }, { capitalize })}
         dangerouslySetInnerHTML={{ __html }}
@@ -30,10 +31,10 @@ function Text<T>(props: TextProps<T>): JSX.Element {
     );
   } else
     return (
-      <Component {...rest} data-testid="txt" className={cn(className, variant, { capitalize })}>
+      <Component {...rest} ref={ref} data-testid="txt" className={cn(className, variant, { capitalize })}>
         {typeof children === "string" ? _.unescape(children) : children}
       </Component>
     );
 }
 
-export default Text;
+export default forwardRef(Text) as <T>(p: TextProps<T> & { ref?: LegacyRef<T> }) => ReactElement;
diff --git a/src/components/extensive/ActionTracker/cards/__snapshots__/ApplicationsCard.stories.storyshot b/src/components/extensive/ActionTracker/cards/__snapshots__/ApplicationsCard.stories.storyshot
index 786fab0dc..024613e50 100644
--- a/src/components/extensive/ActionTracker/cards/__snapshots__/ApplicationsCard.stories.storyshot
+++ b/src/components/extensive/ActionTracker/cards/__snapshots__/ApplicationsCard.stories.storyshot
@@ -258,24 +258,6 @@ exports[`Storyshots Components/Extensive/ActionTracker/ApplicationsCard Default
             >
               TerraFund for AFR100: Landscapes - Expression of Interest (Enterprises)
             </p>
-            <div
-              className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-error-200"
-            >
-              <div
-                style={
-                  Object {
-                    "height": undefined,
-                    "width": 24,
-                  }
-                }
-              />
-              <p
-                className="pt-0.5 text-bold-caption-100"
-                data-testid="txt"
-              >
-                Rejected
-              </p>
-            </div>
           </div>
           <p
             className="text-body-300 with-inner-html"
@@ -328,6 +310,24 @@ exports[`Storyshots Components/Extensive/ActionTracker/ApplicationsCard Default
             >
               TerraFund for AFR100: Landscapes - Expression of Interest (Enterprises)
             </p>
+            <div
+              className="flex items-center gap-1.5 whitespace-nowrap rounded-xl py-0.5 pr-3 pl-1.5 bg-tertiary-200"
+            >
+              <div
+                style={
+                  Object {
+                    "height": undefined,
+                    "width": 24,
+                  }
+                }
+              />
+              <p
+                className="pt-0.5 text-bold-caption-100"
+                data-testid="txt"
+              >
+                More info requested
+              </p>
+            </div>
           </div>
           <p
             className="text-body-300 with-inner-html"
@@ -395,7 +395,7 @@ exports[`Storyshots Components/Extensive/ActionTracker/ApplicationsCard Default
                 className="pt-0.5 text-bold-caption-100"
                 data-testid="txt"
               >
-                Awaiting Review
+                Awaiting approval
               </p>
             </div>
           </div>
diff --git a/src/components/extensive/List/List.tsx b/src/components/extensive/List/List.tsx
index 09bb7a9e7..3ccc82ef0 100644
--- a/src/components/extensive/List/List.tsx
+++ b/src/components/extensive/List/List.tsx
@@ -38,7 +38,7 @@ const List = <T extends Record<any, any>, U>({
     <ListComponent {...listComponentClassnames}>
       {startListElement ? <ItemComponent>{startListElement}</ItemComponent> : <></>}
       {items.map((item, i, array) => (
-        <Fragment key={uniqueId ? item[uniqueId] : i}>
+        <Fragment key={uniqueId ? `${item[uniqueId]}-${i}` : i}>
           <ItemComponent {...listItemComponentClassnames}>{render(item, i, array)}</ItemComponent>
           <When condition={i < items.length - 1}>{dividerComponent}</When>
         </Fragment>
diff --git a/src/components/extensive/Pagination/__snapshots__/PerPageSelector.stories.storyshot b/src/components/extensive/Pagination/__snapshots__/PerPageSelector.stories.storyshot
index fcfc894f3..efcc498c7 100644
--- a/src/components/extensive/Pagination/__snapshots__/PerPageSelector.stories.storyshot
+++ b/src/components/extensive/Pagination/__snapshots__/PerPageSelector.stories.storyshot
@@ -35,7 +35,16 @@ exports[`Storyshots Components/Elements/Table/PerPageSelector Default 1`] = `
         </div>
         <div
           className="flex h-full flex-1 items-center justify-center rounded-r-lg bg-primary-200"
-        />
+        >
+          <div
+            style={
+              Object {
+                "height": undefined,
+                "width": 20,
+              }
+            }
+          />
+        </div>
       </div>
       <p
         className="text-bold-subtitle-500"
diff --git a/src/components/extensive/WorkdayCollapseGrid/WorkdaySection.tsx b/src/components/extensive/WorkdayCollapseGrid/WorkdaySection.tsx
index a70421577..54330db9e 100644
--- a/src/components/extensive/WorkdayCollapseGrid/WorkdaySection.tsx
+++ b/src/components/extensive/WorkdayCollapseGrid/WorkdaySection.tsx
@@ -68,7 +68,7 @@ const WorkdaySection = ({ demographics, type, variant, onChange }: WorkdaySectio
       updatedDemographics.splice(index, 1);
       onChange(updatedDemographics);
     },
-    [demographics, onChange, type]
+    [demographics, onChange]
   );
 
   // Tailwind doesn't supply classes for high row counts, so we apply this prop ourselves.
diff --git a/src/components/extensive/WorkdayCollapseGrid/__snapshots__/WorkdayCollapseGrid.stories.storyshot b/src/components/extensive/WorkdayCollapseGrid/__snapshots__/WorkdayCollapseGrid.stories.storyshot
new file mode 100644
index 000000000..ea26ceea7
--- /dev/null
+++ b/src/components/extensive/WorkdayCollapseGrid/__snapshots__/WorkdayCollapseGrid.stories.storyshot
@@ -0,0 +1,187 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Components/Extensive/WorkdayCollapse Complete Green 1`] = `
+<div
+  className=" rounded-2xl"
+>
+  <div>
+    <button
+      className="flex w-full items-center justify-between p-4 rounded-t-2xl bg-customGreen-100 rounded-2xl"
+      onClick={[Function]}
+    >
+      <p
+        className="text-18-bold"
+        data-testid="txt"
+      >
+        A. Site Establishment Paid - 90 Days
+      </p>
+      <div
+        className="flex items-baseline gap-2"
+      >
+        <p
+          className="flex items-start gap-2 leading-normal text-customGreen-200 text-14-bold"
+          data-testid="txt"
+        >
+          Complete
+          <div
+            style={
+              Object {
+                "height": 16,
+                "width": 16,
+              }
+            }
+          />
+        </p>
+        <div
+          style={
+            Object {
+              "height": 9,
+              "width": 16,
+            }
+          }
+        />
+      </div>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Storyshots Components/Extensive/WorkdayCollapse Default 1`] = `
+<div
+  className=" rounded-2xl"
+>
+  <div>
+    <button
+      className="flex w-full items-center justify-between p-4 rounded bg-neutral-350 undefined"
+      onClick={[Function]}
+    >
+      <p
+        className="text-18-bold"
+        data-testid="txt"
+      >
+        A. Site Establishment Paid - 210 Days
+      </p>
+      <div
+        className="flex items-baseline gap-2"
+      >
+        <div
+          style={
+            Object {
+              "height": 9,
+              "width": 16,
+            }
+          }
+        />
+      </div>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Storyshots Components/Extensive/WorkdayCollapse In Progress Green 1`] = `
+<div
+  className="rounded-2xl"
+>
+  <div>
+    <button
+      className="flex w-full items-center justify-between p-4 rounded-t-2xl bg-customGreen-100 rounded-2xl"
+      onClick={[Function]}
+    >
+      <p
+        className="text-18-bold"
+        data-testid="txt"
+      >
+        A. Site Establishment Paid - 75 Days
+      </p>
+      <div
+        className="flex items-baseline gap-2"
+      >
+        <p
+          className="flex items-start gap-2 leading-normal text-tertiary-450 text-14-bold"
+          data-testid="txt"
+        >
+          In Progress
+        </p>
+        <div
+          style={
+            Object {
+              "height": 9,
+              "width": 16,
+            }
+          }
+        />
+      </div>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Storyshots Components/Extensive/WorkdayCollapse Not Started Green 1`] = `
+<div
+  className=" rounded-2xl"
+>
+  <div>
+    <button
+      className="flex w-full items-center justify-between p-4 rounded-t-2xl bg-customGreen-100 rounded-2xl"
+      onClick={[Function]}
+    >
+      <p
+        className="text-18-bold"
+        data-testid="txt"
+      >
+        A. Site Establishment Paid - 0 Days
+      </p>
+      <div
+        className="flex items-baseline gap-2"
+      >
+        <p
+          className="flex items-start gap-2 leading-normal text-neutral-550 text-14-bold"
+          data-testid="txt"
+        >
+          Not Started
+        </p>
+        <div
+          style={
+            Object {
+              "height": 9,
+              "width": 16,
+            }
+          }
+        />
+      </div>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Storyshots Components/Extensive/WorkdayCollapse Variant Narrow 1`] = `
+<div
+  className="w-1/2 rounded-2xl"
+>
+  <div>
+    <button
+      className="flex w-full items-center justify-between p-4 rounded bg-neutral-350 undefined"
+      onClick={[Function]}
+    >
+      <p
+        className="text-18-bold"
+        data-testid="txt"
+      >
+        A. Nursery Operations Volunteer - 220 Days
+      </p>
+      <div
+        className="flex items-baseline gap-2"
+      >
+        <div
+          style={
+            Object {
+              "height": 9,
+              "width": 16,
+            }
+          }
+        />
+      </div>
+    </button>
+  </div>
+</div>
+`;
diff --git a/src/components/generic/Layout/__snapshots__/MainLayout.stories.storyshot b/src/components/generic/Layout/__snapshots__/MainLayout.stories.storyshot
index f6702a91d..e2244bb59 100644
--- a/src/components/generic/Layout/__snapshots__/MainLayout.stories.storyshot
+++ b/src/components/generic/Layout/__snapshots__/MainLayout.stories.storyshot
@@ -13,6 +13,14 @@ exports[`Storyshots Components/Generic/Layouts/MainLayout Default 1`] = `
       <section
         className="mx-auto w-full max-w-[1218px] flex h-[70px] items-center justify-between"
       >
+        <div
+          style={
+            Object {
+              "height": 30,
+              "width": 108,
+            }
+          }
+        />
         <div
           className="hidden items-center gap-8 lg:flex"
         >
@@ -34,11 +42,27 @@ exports[`Storyshots Components/Generic/Layouts/MainLayout Default 1`] = `
                 onMouseDown={[Function]}
                 type="button"
               >
+                <div
+                  style={
+                    Object {
+                      "height": undefined,
+                      "width": 16,
+                    }
+                  }
+                />
                 <span
                   className="mr-2 whitespace-nowrap text-sm uppercase text-neutral-900"
                 >
                   English
                 </span>
+                <div
+                  style={
+                    Object {
+                      "height": undefined,
+                      "width": 8,
+                    }
+                  }
+                />
               </button>
             </div>
           </div>
@@ -103,6 +127,14 @@ exports[`Storyshots Components/Generic/Layouts/MainLayout Default 1`] = `
               <div
                 className="flex items-center"
               >
+                <div
+                  style={
+                    Object {
+                      "height": undefined,
+                      "width": 16,
+                    }
+                  }
+                />
                 <span
                   className="whitespace-nowrap text-neutral-900 lg:text-body-300 text-heading-400"
                   data-testid="txt"
@@ -127,11 +159,27 @@ exports[`Storyshots Components/Generic/Layouts/MainLayout Default 1`] = `
               onMouseDown={[Function]}
               type="button"
             >
+              <div
+                style={
+                  Object {
+                    "height": undefined,
+                    "width": 16,
+                  }
+                }
+              />
               <span
                 className="mr-2 whitespace-nowrap text-sm uppercase text-neutral-900"
               >
                 English
               </span>
+              <div
+                style={
+                  Object {
+                    "height": undefined,
+                    "width": 8,
+                  }
+                }
+              />
             </button>
           </div>
         </div>
@@ -139,7 +187,16 @@ exports[`Storyshots Components/Generic/Layouts/MainLayout Default 1`] = `
           className="flex items-center justify-center rounded-full hover:bg-opacity-60 tour-menu-button block lg:hidden"
           disabled={false}
           onClick={[Function]}
-        />
+        >
+          <div
+            style={
+              Object {
+                "height": 16,
+                "width": 28,
+              }
+            }
+          />
+        </button>
       </section>
     </header>
     <main
diff --git a/src/components/generic/Navbar/__snapshots__/Navbar.stories.storyshot b/src/components/generic/Navbar/__snapshots__/Navbar.stories.storyshot
index 7aaa14de4..b55e7b089 100644
--- a/src/components/generic/Navbar/__snapshots__/Navbar.stories.storyshot
+++ b/src/components/generic/Navbar/__snapshots__/Navbar.stories.storyshot
@@ -7,6 +7,14 @@ exports[`Storyshots Components/Generic/Navbar Logged In 1`] = `
   <section
     className="mx-auto w-full max-w-[1218px] flex h-[70px] items-center justify-between"
   >
+    <div
+      style={
+        Object {
+          "height": 30,
+          "width": 108,
+        }
+      }
+    />
     <div
       className="hidden items-center gap-8 lg:flex"
     >
@@ -28,11 +36,27 @@ exports[`Storyshots Components/Generic/Navbar Logged In 1`] = `
             onMouseDown={[Function]}
             type="button"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 16,
+                }
+              }
+            />
             <span
               className="mr-2 whitespace-nowrap text-sm uppercase text-neutral-900"
             >
               English
             </span>
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 8,
+                }
+              }
+            />
           </button>
         </div>
       </div>
@@ -74,6 +98,14 @@ exports[`Storyshots Components/Generic/Navbar Logged In 1`] = `
           <div
             className="flex items-center"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 16,
+                }
+              }
+            />
             <span
               className="whitespace-nowrap text-neutral-900 lg:text-body-300 text-heading-400"
               data-testid="txt"
@@ -98,11 +130,27 @@ exports[`Storyshots Components/Generic/Navbar Logged In 1`] = `
           onMouseDown={[Function]}
           type="button"
         >
+          <div
+            style={
+              Object {
+                "height": undefined,
+                "width": 16,
+              }
+            }
+          />
           <span
             className="mr-2 whitespace-nowrap text-sm uppercase text-neutral-900"
           >
             English
           </span>
+          <div
+            style={
+              Object {
+                "height": undefined,
+                "width": 8,
+              }
+            }
+          />
         </button>
       </div>
     </div>
@@ -110,7 +158,16 @@ exports[`Storyshots Components/Generic/Navbar Logged In 1`] = `
       className="flex items-center justify-center rounded-full hover:bg-opacity-60 tour-menu-button block lg:hidden"
       disabled={false}
       onClick={[Function]}
-    />
+    >
+      <div
+        style={
+          Object {
+            "height": 16,
+            "width": 28,
+          }
+        }
+      />
+    </button>
   </section>
 </header>
 `;
@@ -122,6 +179,14 @@ exports[`Storyshots Components/Generic/Navbar Logged Out 1`] = `
   <section
     className="mx-auto w-full max-w-[1218px] flex h-[70px] items-center justify-between"
   >
+    <div
+      style={
+        Object {
+          "height": 30,
+          "width": 108,
+        }
+      }
+    />
     <div
       className="hidden items-center gap-8 lg:flex"
     >
@@ -143,11 +208,27 @@ exports[`Storyshots Components/Generic/Navbar Logged Out 1`] = `
             onMouseDown={[Function]}
             type="button"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 16,
+                }
+              }
+            />
             <span
               className="mr-2 whitespace-nowrap text-sm uppercase text-neutral-900"
             >
               English
             </span>
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 8,
+                }
+              }
+            />
           </button>
         </div>
       </div>
@@ -212,6 +293,14 @@ exports[`Storyshots Components/Generic/Navbar Logged Out 1`] = `
           <div
             className="flex items-center"
           >
+            <div
+              style={
+                Object {
+                  "height": undefined,
+                  "width": 16,
+                }
+              }
+            />
             <span
               className="whitespace-nowrap text-neutral-900 lg:text-body-300 text-heading-400"
               data-testid="txt"
@@ -236,11 +325,27 @@ exports[`Storyshots Components/Generic/Navbar Logged Out 1`] = `
           onMouseDown={[Function]}
           type="button"
         >
+          <div
+            style={
+              Object {
+                "height": undefined,
+                "width": 16,
+              }
+            }
+          />
           <span
             className="mr-2 whitespace-nowrap text-sm uppercase text-neutral-900"
           >
             English
           </span>
+          <div
+            style={
+              Object {
+                "height": undefined,
+                "width": 8,
+              }
+            }
+          />
         </button>
       </div>
     </div>
@@ -248,7 +353,16 @@ exports[`Storyshots Components/Generic/Navbar Logged Out 1`] = `
       className="flex items-center justify-center rounded-full hover:bg-opacity-60 tour-menu-button block lg:hidden"
       disabled={false}
       onClick={[Function]}
-    />
+    >
+      <div
+        style={
+          Object {
+            "height": 16,
+            "width": 28,
+          }
+        }
+      />
+    </button>
   </section>
 </header>
 `;
diff --git a/src/constants/options/__snapshots__/landTenure.test.ts.snap b/src/constants/options/__snapshots__/landTenure.test.ts.snap
index 9b813c2d1..b55686087 100644
--- a/src/constants/options/__snapshots__/landTenure.test.ts.snap
+++ b/src/constants/options/__snapshots__/landTenure.test.ts.snap
@@ -4,42 +4,42 @@ exports[`snapShot test getLandTenureOptions 1`] = `
 [
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/land-tenures/public.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/land-tenures/public.png",
     },
     "title": "Public",
     "value": "public",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/land-tenures/private.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/land-tenures/private.png",
     },
     "title": "Private",
     "value": "private",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/land-tenures/indigenous.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/land-tenures/indigenous.png",
     },
     "title": "Indigenous",
     "value": "indigenous",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/land-tenures/communal.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/land-tenures/communal.png",
     },
     "title": "Communal",
     "value": "communal",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/land-tenures/national-protected-area.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/land-tenures/national-protected-area.png",
     },
     "title": "National Protected Area",
     "value": "national-protected-area",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/land-tenures/other.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/land-tenures/other.png",
     },
     "title": "Other",
     "value": "other",
diff --git a/src/constants/options/__snapshots__/restorationInterventionTypes.test.ts.snap b/src/constants/options/__snapshots__/restorationInterventionTypes.test.ts.snap
index e72ebdcc9..6fce06118 100644
--- a/src/constants/options/__snapshots__/restorationInterventionTypes.test.ts.snap
+++ b/src/constants/options/__snapshots__/restorationInterventionTypes.test.ts.snap
@@ -4,63 +4,63 @@ exports[`snapShot test getRestorationInterventionTypeOptions 1`] = `
 [
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/restoration-methods/agroforestry@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/restoration-methods/agroforestry@2x.png",
     },
     "title": "Agroforestry",
     "value": "agroforestry",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/restoration-methods/applied_nucleation_tree_island@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/restoration-methods/applied_nucleation_tree_island@2x.png",
     },
     "title": "Applied Nucleation",
     "value": "applied-nucleation",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/restoration-methods/assisted_natural@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/restoration-methods/assisted_natural@2x.png",
     },
     "title": "Assisted Natural Regeneration",
     "value": "assisted-natural-regeneration",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/restoration-methods/direct_seeding@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/restoration-methods/direct_seeding@2x.png",
     },
     "title": "Direct Seeding",
     "value": "direct-seeding",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/restoration-methods/enrichment_planting@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/restoration-methods/enrichment_planting@2x.png",
     },
     "title": "Enrichment Planting",
     "value": "enrichment-planting",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/restoration-methods/mangrove@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/restoration-methods/mangrove@2x.png",
     },
     "title": "Mangrove Restoration",
     "value": "mangrove-restoration",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/restoration-methods/reforestation@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/restoration-methods/reforestation@2x.png",
     },
     "title": "Reforestation",
     "value": "reforestation",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/restoration-methods/riparian@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/restoration-methods/riparian@2x.png",
     },
     "title": "Riparian Restoration",
     "value": "riparian-restoration",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/restoration-methods/silvopasture@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/restoration-methods/silvopasture@2x.png",
     },
     "title": "Silvopasture",
     "value": "silvopasture",
diff --git a/src/constants/options/__snapshots__/status.test.ts.snap b/src/constants/options/__snapshots__/status.test.ts.snap
index 47df3e24e..af9d78dc5 100644
--- a/src/constants/options/__snapshots__/status.test.ts.snap
+++ b/src/constants/options/__snapshots__/status.test.ts.snap
@@ -6,10 +6,6 @@ exports[`snapShot getStatusOptions 1`] = `
     "title": "Draft",
     "value": "started",
   },
-  {
-    "title": "Rejected",
-    "value": "rejected",
-  },
   {
     "title": "Approved",
     "value": "approved",
diff --git a/src/constants/options/__snapshots__/sustainableDevelopmentGoals.test.ts.snap b/src/constants/options/__snapshots__/sustainableDevelopmentGoals.test.ts.snap
index 73d313f82..4b737eee6 100644
--- a/src/constants/options/__snapshots__/sustainableDevelopmentGoals.test.ts.snap
+++ b/src/constants/options/__snapshots__/sustainableDevelopmentGoals.test.ts.snap
@@ -4,119 +4,119 @@ exports[`snapShot test sustainableDevelopmentGoalsOptions 1`] = `
 [
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/no_poverty@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/no_poverty@2x.png",
     },
     "title": "No Poverty",
     "value": "no-poverty",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/zero_hunger@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/zero_hunger@2x.png",
     },
     "title": "Zero Hunger",
     "value": "zero-hunger",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/good-health-and-well-being@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/good-health-and-well-being@2x.png",
     },
     "title": "Good Health and Well-being",
     "value": "good-health-and-well-being",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/quality-education@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/quality-education@2x.png",
     },
     "title": "Quality Education",
     "value": "quality-education",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/gender-equality@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/gender-equality@2x.png",
     },
     "title": "Gender Equality",
     "value": "gender-equality",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/clean-water-and-sanitation@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/clean-water-and-sanitation@2x.png",
     },
     "title": "Clean Water and Sanitation",
     "value": "clean-water-and-sanitation",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/affordable-and-clean-energy@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/affordable-and-clean-energy@2x.png",
     },
     "title": "Affordable and Clean Energy",
     "value": "affordable-and-clean-energy",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/decent-work-and-economic-growth@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/decent-work-and-economic-growth@2x.png",
     },
     "title": "Decent Work and Economic Growth",
     "value": "decent-work-and-economic-growth",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/industry-innovation-and-infrastructure@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/industry-innovation-and-infrastructure@2x.png",
     },
     "title": "Industry, Innovation, and Infrastructure",
     "value": "industry-innovation-and-infrastructure",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/reduced-inequalities@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/reduced-inequalities@2x.png",
     },
     "title": "Reduced Inequalities",
     "value": "reduced-inequalities",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/sustainable-cities-and-communities@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/sustainable-cities-and-communities@2x.png",
     },
     "title": "Sustainable Cities and Communities",
     "value": "sustainable-cities-and-communities",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/responsible-consumption-and-production@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/responsible-consumption-and-production@2x.png",
     },
     "title": "Responsible Consumption and Production",
     "value": "responsible-consumption-and-production",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/climate-action@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/climate-action@2x.png",
     },
     "title": "Climate Action",
     "value": "climate-action",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/life-below-water@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/life-below-water@2x.png",
     },
     "title": "Life Below Water",
     "value": "life-below-water",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/life-on-land@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/life-on-land@2x.png",
     },
     "title": "Life on Land",
     "value": "life-on-land",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/peace-justice-and-strong-institutions@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/peace-justice-and-strong-institutions@2x.png",
     },
     "title": "Peace, Justice, and Strong Institutions",
     "value": "peace-justice-and-strong-institutions",
   },
   {
     "meta": {
-      "image_url": "https://test.wrirestorationmarketplace.cubeapis.com/images/V2/sustainable-development-goals/partnerships-for-the-goals@2x.png",
+      "image_url": "https://new-wri-staging.wri-restoration-marketplace-api.com/images/V2/sustainable-development-goals/partnerships-for-the-goals@2x.png",
     },
     "title": "Partnerships for the Goals",
     "value": "partnerships-for-the-goals",
diff --git a/src/context/modal.provider.test.tsx b/src/context/modal.provider.test.tsx
index 95354fc2f..6ca8538a1 100644
--- a/src/context/modal.provider.test.tsx
+++ b/src/context/modal.provider.test.tsx
@@ -1,4 +1,5 @@
 import { renderHook } from "@testing-library/react";
+import { act } from "react-dom/test-utils";
 
 import { wait } from "@/utils/test-utils";
 
@@ -12,7 +13,7 @@ describe("Modal context provider", () => {
       wrapper: props => <ModalProvider>{props.children}</ModalProvider>
     });
 
-    result.current.openModal(Modal);
+    act(() => result.current.openModal(Modal));
     await wait(200);
 
     expect(result.current.modalOpen).toEqual(true);
@@ -24,10 +25,10 @@ describe("Modal context provider", () => {
       wrapper: props => <ModalProvider>{props.children}</ModalProvider>
     });
 
-    result.current.openModal(Modal);
+    act(() => result.current.openModal(Modal));
     await wait(200);
 
-    result.current.closeModal();
+    act(() => result.current.closeModal());
     await wait(200);
 
     expect(result.current.modalOpen).toEqual(false);
@@ -38,7 +39,7 @@ describe("Modal context provider", () => {
       wrapper: props => <ModalProvider>{props.children}</ModalProvider>
     });
 
-    result.current.setModalContent(Modal);
+    act(() => result.current.setModalContent(Modal));
     await wait(200);
 
     expect(result.current.modalContent).toEqual(Modal);
diff --git a/src/hooks/useGetCustomFormSteps/__snapshots__/useGetCustomFormSteps.stories.storyshot b/src/hooks/useGetCustomFormSteps/__snapshots__/useGetCustomFormSteps.stories.storyshot
index 5d9041557..b0167205e 100644
--- a/src/hooks/useGetCustomFormSteps/__snapshots__/useGetCustomFormSteps.stories.storyshot
+++ b/src/hooks/useGetCustomFormSteps/__snapshots__/useGetCustomFormSteps.stories.storyshot
@@ -237,6 +237,14 @@ exports[`Storyshots Components/Extensive/Form/Wizard With Get Form Step Hook 1`]
                     <span
                       className="w-full line-clamp-1"
                     />
+                    <div
+                      style={
+                        Object {
+                          "height": undefined,
+                          "width": 16,
+                        }
+                      }
+                    />
                   </div>
                 </div>
               </li>
@@ -279,6 +287,14 @@ exports[`Storyshots Components/Extensive/Form/Wizard With Get Form Step Hook 1`]
                     <span
                       className="w-full line-clamp-1"
                     />
+                    <div
+                      style={
+                        Object {
+                          "height": undefined,
+                          "width": 16,
+                        }
+                      }
+                    />
                   </div>
                 </div>
               </li>
@@ -385,6 +401,14 @@ exports[`Storyshots Components/Extensive/Form/Wizard With Get Form Step Hook 1`]
                     <span
                       className="w-full line-clamp-1"
                     />
+                    <div
+                      style={
+                        Object {
+                          "height": undefined,
+                          "width": 16,
+                        }
+                      }
+                    />
                   </div>
                 </div>
               </li>
@@ -789,16 +813,25 @@ exports[`Storyshots Components/Extensive/Form/Wizard With Get Form Step Hook 1`]
                       <div
                         className="bg-primary-100 flex h-15 w-15 items-center justify-center rounded-lg bg-cover bg-no-repeat"
                         style={Object {}}
-                      />
+                      >
+                        <div
+                          style={
+                            Object {
+                              "height": 32,
+                              "width": 24,
+                            }
+                          }
+                        />
+                      </div>
                       <div
                         className="flex-1"
                       >
                         <p
                           className="mb-1 line-clamp-1 text-bold-subtitle-400"
                           data-testid="txt"
-                          title="Upload File (File format: PDF max. 5MB)"
+                          title="Upload File (File format: PDF max. 10MB)"
                         >
-                          Upload File (File format: PDF max. 5MB)
+                          Upload File (File format: PDF max. 10MB)
                         </p>
                         <p
                           className="line-clamp-1 text-light-body-300 with-inner-html"
diff --git a/src/hooks/useGetReportingWindow.test.ts b/src/hooks/useGetReportingWindow.test.ts
index 14386e83f..fc7bd1ebf 100644
--- a/src/hooks/useGetReportingWindow.test.ts
+++ b/src/hooks/useGetReportingWindow.test.ts
@@ -11,7 +11,7 @@ describe("Test useGetReportingWindow hook", () => {
       const { getReportingWindow } = useGetReportingWindow();
       return getReportingWindow(due_date, "bi-annually");
     });
-    expect(result.current).toBe("November - April 2023");
+    expect(result.current).toBe("October - March 2023");
   });
 
   test("Test `quarterly` window", () => {
@@ -20,6 +20,6 @@ describe("Test useGetReportingWindow hook", () => {
       const { getReportingWindow } = useGetReportingWindow();
       return getReportingWindow(due_date, "quarterly");
     });
-    expect(result.current).toBe("February - April 2023");
+    expect(result.current).toBe("January - March 2023");
   });
 });
diff --git a/src/pages/nursery/[uuid]/index.page.tsx b/src/pages/nursery/[uuid]/index.page.tsx
index 2560abd40..364552260 100644
--- a/src/pages/nursery/[uuid]/index.page.tsx
+++ b/src/pages/nursery/[uuid]/index.page.tsx
@@ -96,7 +96,7 @@ const NurseryDetailPage = () => {
           nursery.framework_key === "ppc"
             ? t("Priceless Planet Coalition")
             : nursery.framework_key === "hbf"
-            ? "HBF"
+            ? "Harit Bharat Fund"
             : t("TerraFund")
         ]}
         hasBackButton={false}
diff --git a/src/pages/project/[uuid]/index.page.tsx b/src/pages/project/[uuid]/index.page.tsx
index 4b9d7bce0..8036db1b8 100644
--- a/src/pages/project/[uuid]/index.page.tsx
+++ b/src/pages/project/[uuid]/index.page.tsx
@@ -109,7 +109,7 @@ const ProjectDetailPage = () => {
           isPPC
             ? t("Priceless Planet Coalition")
             : isHBF
-            ? "HBF"
+            ? "Harit Bharat Fund"
             : isTerrafund
             ? t("TerraFund")
             : reportingFramework.name
diff --git a/src/pages/project/[uuid]/tabs/Overview.tsx b/src/pages/project/[uuid]/tabs/Overview.tsx
index a1c11230d..40556f5f4 100644
--- a/src/pages/project/[uuid]/tabs/Overview.tsx
+++ b/src/pages/project/[uuid]/tabs/Overview.tsx
@@ -52,7 +52,11 @@ const ProjectOverviewTab = ({ project }: ProjectOverviewTabProps) => {
           <div className="flex w-full flex-wrap gap-6">
             <If condition={isPPC}>
               <Then>
-                <GoalProgressCard label={t("Workday (PPC)")} value={project.workday_count} className="w-[170px]" />
+                <GoalProgressCard
+                  label={t("Workday (PPC)")}
+                  value={project.self_reported_workday_count}
+                  className="w-[170px]"
+                />
               </Then>
               <Else>
                 <GoalProgressCard
diff --git a/src/pages/site/[uuid]/index.page.tsx b/src/pages/site/[uuid]/index.page.tsx
index f6904f40c..6debfea7c 100644
--- a/src/pages/site/[uuid]/index.page.tsx
+++ b/src/pages/site/[uuid]/index.page.tsx
@@ -81,7 +81,7 @@ const SiteDetailPage = () => {
 
   const subtitles = [
     `${t("Organisation")}: ${site.organisation?.name}`,
-    isPPC ? t("Priceless Planet Coalition") : isHBF ? "HBF" : t("TerraFund")
+    isPPC ? t("Priceless Planet Coalition") : isHBF ? "Harit Bharat Fund" : t("TerraFund")
   ];
   if (isPPC) {
     subtitles.push(t("Site ID: {id}", { id: site.ppc_external_id }));
diff --git a/src/pages/site/[uuid]/tabs/Overview.tsx b/src/pages/site/[uuid]/tabs/Overview.tsx
index 1f4836071..ceb781a50 100644
--- a/src/pages/site/[uuid]/tabs/Overview.tsx
+++ b/src/pages/site/[uuid]/tabs/Overview.tsx
@@ -90,7 +90,11 @@ const SiteOverviewTab = ({ site }: SiteOverviewTabProps) => {
         >
           <div className="flex w-full flex-wrap gap-6">
             <When condition={isPPC}>
-              <GoalProgressCard label={t("Workday Count (PPC)")} value={site.workday_count} className="w-[170px]" />
+              <GoalProgressCard
+                label={t("Workday Count (PPC)")}
+                value={site.self_reported_workday_count}
+                className="w-[170px]"
+              />
             </When>
             <GoalProgressCard
               label={t("Hectares Restored Goal")}
diff --git a/yarn.lock b/yarn.lock
index 505c07800..c18015ffc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12798,17 +12798,17 @@ pug-attrs@^3.0.0:
     js-stringify "^1.0.2"
     pug-runtime "^3.0.0"
 
-pug-code-gen@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.2.tgz#ad190f4943133bf186b60b80de483100e132e2ce"
-  integrity sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==
+pug-code-gen@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.3.tgz#58133178cb423fe1716aece1c1da392a75251520"
+  integrity sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw==
   dependencies:
     constantinople "^4.0.1"
     doctypes "^1.1.0"
     js-stringify "^1.0.2"
     pug-attrs "^3.0.0"
-    pug-error "^2.0.0"
-    pug-runtime "^3.0.0"
+    pug-error "^2.1.0"
+    pug-runtime "^3.0.1"
     void-elements "^3.1.0"
     with "^7.0.0"
 
@@ -12817,6 +12817,11 @@ pug-error@^2.0.0:
   resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.0.0.tgz#5c62173cb09c34de2a2ce04f17b8adfec74d8ca5"
   integrity sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==
 
+pug-error@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.1.0.tgz#17ea37b587b6443d4b8f148374ec27b54b406e55"
+  integrity sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg==
+
 pug-filters@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-4.0.0.tgz#d3e49af5ba8472e9b7a66d980e707ce9d2cc9b5e"
@@ -12879,11 +12884,11 @@ pug-walk@^2.0.0:
   integrity sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==
 
 pug@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.2.tgz#f35c7107343454e43bc27ae0ff76c731b78ea535"
-  integrity sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.3.tgz#e18324a314cd022883b1e0372b8af3a1a99f7597"
+  integrity sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==
   dependencies:
-    pug-code-gen "^3.0.2"
+    pug-code-gen "^3.0.3"
     pug-filters "^4.0.0"
     pug-lexer "^5.0.1"
     pug-linker "^4.0.0"