diff --git a/packages/raystack/components/calendar/date-picker.tsx b/packages/raystack/components/calendar/date-picker.tsx
index 5f434fb3f..000bfc8b9 100644
--- a/packages/raystack/components/calendar/date-picker.tsx
+++ b/packages/raystack/components/calendar/date-picker.tsx
@@ -3,7 +3,7 @@
 import { CalendarIcon } from '@radix-ui/react-icons';
 import { cx } from 'class-variance-authority';
 import dayjs from 'dayjs';
-import customParseFormat from 'dayjs/plugin/customParseFormat.js';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
 import {
   isValidElement,
   useCallback,
diff --git a/packages/raystack/components/data-table/utils/filter-operations.tsx b/packages/raystack/components/data-table/utils/filter-operations.tsx
index 58ddb6d4a..d113e1838 100644
--- a/packages/raystack/components/data-table/utils/filter-operations.tsx
+++ b/packages/raystack/components/data-table/utils/filter-operations.tsx
@@ -1,7 +1,7 @@
 import type { FilterFn } from '@tanstack/table-core';
 import dayjs from 'dayjs';
-import isSameOrAfter from 'dayjs/plugin/isSameOrAfter.js';
-import isSameOrBefore from 'dayjs/plugin/isSameOrBefore.js';
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 
 import {
   DataTableFilterOperatorTypes,
diff --git a/packages/raystack/rollup.config.mjs b/packages/raystack/rollup.config.mjs
index 1840e6307..341224364 100644
--- a/packages/raystack/rollup.config.mjs
+++ b/packages/raystack/rollup.config.mjs
@@ -100,7 +100,13 @@ const rollupConfig = configs.map(conf => {
         sourcemap: true,
         exports: 'named',
         preserveModules: true,
-        preserveModulesRoot: conf.inputPath
+        preserveModulesRoot: conf.inputPath,
+        paths: id => {
+          if (id === 'dayjs') return 'dayjs/esm';
+          if (id.startsWith('dayjs/plugin/'))
+            return id.replace('dayjs/plugin/', 'dayjs/esm/plugin/');
+          return id;
+        }
       },
       {
         dir: conf.outputPath,