diff --git a/wavefront/client/src/api/app-user-service.ts b/wavefront/client/src/api/app-user-service.ts
index 0bd3f471..87ae8cbc 100644
--- a/wavefront/client/src/api/app-user-service.ts
+++ b/wavefront/client/src/api/app-user-service.ts
@@ -22,8 +22,8 @@ export class AppUserService {
   /**
    * List users with access to an app (owners only)
    */
-  async listAppUsers(appId: string): Promise<IApiResponse<{ users: IUser[] }>> {
-    return this.http.get(`/v1/apps/${appId}/users`);
+  async listAppUsers(): Promise<IApiResponse<{ users: IUser[] }>> {
+    return this.http.get(`/v1/:appId/floware/v1/users`);
   }
 
   /**
diff --git a/wavefront/client/src/api/scheduled-job-service.ts b/wavefront/client/src/api/scheduled-job-service.ts
index e6758775..dcd26c97 100644
--- a/wavefront/client/src/api/scheduled-job-service.ts
+++ b/wavefront/client/src/api/scheduled-job-service.ts
@@ -3,6 +3,7 @@ import {
   CreateScheduledJobResponse,
   DeleteScheduledJobResponse,
   ListScheduledJobsResponse,
+  UpdateScheduledJobRequest,
   UpdateScheduledJobResponse,
 } from '@app/types/scheduled-job';
 import { AxiosInstance } from 'axios';
@@ -16,6 +17,7 @@ export class ScheduledJobService {
 
   async listScheduledJobs(params: {
     limit?: number;
+    offset?: number;
     query_id?: string;
     datasource_id?: string;
     job_type?: string;
@@ -24,20 +26,19 @@ export class ScheduledJobService {
     return this.http.get(`/v1/:appId/floware/v1/scheduled-jobs`, { params });
   }
 
-  async updateScheduledJob(
-    jobId: string,
-    payload: {
-      cron_expr?: string;
-      timezone?: string;
-      payload?: Record<string, unknown>;
-      max_retries?: number;
-      status?: 'active' | 'paused' | 'running' | 'failed' | 'completed';
-    }
-  ): Promise<UpdateScheduledJobResponse> {
-    return this.http.patch(`/v1/:appId/floware/v1/scheduled-jobs/${jobId}`, payload);
+  async updateScheduledJob(jobId: string, request: UpdateScheduledJobRequest): Promise<UpdateScheduledJobResponse> {
+    return this.http.patch(`/v1/:appId/floware/v1/scheduled-jobs/${jobId}`, request);
   }
 
   async deleteScheduledJob(jobId: string): Promise<DeleteScheduledJobResponse> {
     return this.http.delete(`/v1/:appId/floware/v1/scheduled-jobs/${jobId}`);
   }
+
+  async pauseScheduledJob(jobId: string): Promise<UpdateScheduledJobResponse> {
+    return this.http.post(`/v1/:appId/floware/v1/scheduled-jobs/${jobId}/pause`);
+  }
+
+  async resumeScheduledJob(jobId: string): Promise<UpdateScheduledJobResponse> {
+    return this.http.post(`/v1/:appId/floware/v1/scheduled-jobs/${jobId}/resume`);
+  }
 }
diff --git a/wavefront/client/src/assets/icons/index.ts b/wavefront/client/src/assets/icons/index.ts
index 90218e74..629ae24f 100644
--- a/wavefront/client/src/assets/icons/index.ts
+++ b/wavefront/client/src/assets/icons/index.ts
@@ -6,5 +6,6 @@ export { default as ModelRepositoryIcon } from './model-repository-icon';
 export { default as PermissionIcon } from './permission-icon';
 export { PhoneActiveIcon, PhoneIcon } from './phone-icon';
 export { default as RagIcon } from './rag-icon';
+export { default as ScheduledJobsIcon } from './scheduled-jobs-icon';
 export { default as RootfloIcon } from './rootflo-icon';
 export { default as WorkflowIcon } from './workflow-icon';
diff --git a/wavefront/client/src/assets/icons/scheduled-jobs-icon.tsx b/wavefront/client/src/assets/icons/scheduled-jobs-icon.tsx
new file mode 100644
index 00000000..b884c881
--- /dev/null
+++ b/wavefront/client/src/assets/icons/scheduled-jobs-icon.tsx
@@ -0,0 +1,13 @@
+const ScheduledJobsIcon = ({ ...props }: React.SVGProps<SVGSVGElement>) => (
+  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16" {...props}>
+    <path
+      stroke="#585858"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      d="M8 2.667v2.666M8 10.667v2.666M4 8H2.667M13.333 8H12M4.343 4.343l1.886 1.886M9.771 9.771l1.886 1.886M4.343 11.657l1.886-1.886M9.771 6.229l1.886-1.886"
+    />
+    <circle cx="8" cy="8" r="2.667" stroke="#585858" strokeLinecap="round" strokeLinejoin="round" />
+  </svg>
+);
+
+export default ScheduledJobsIcon;
diff --git a/wavefront/client/src/hooks/data/fetch-hooks.ts b/wavefront/client/src/hooks/data/fetch-hooks.ts
index c49feb3d..bf415cc1 100644
--- a/wavefront/client/src/hooks/data/fetch-hooks.ts
+++ b/wavefront/client/src/hooks/data/fetch-hooks.ts
@@ -15,6 +15,7 @@ import { TelephonyConfig } from '@app/types/telephony-config';
 import { ToolDetails, VoiceAgentTool, VoiceAgentToolWithAssociation } from '@app/types/tool';
 import { TtsConfig } from '@app/types/tts-config';
 import { VoiceAgent } from '@app/types/voice-agent';
+import { ScheduledJob } from '@app/types/scheduled-job';
 import { WorkflowListItem, WorkflowPipelineListItem, WorkflowRunListData } from '@app/types/workflow';
 import { UseQueryResult } from '@tanstack/react-query';
 
@@ -28,6 +29,7 @@ import {
   getApiServiceQueryFn,
   getApiServicesQueryFn,
   getAppByIdFn,
+  getAppUsersQueryFn,
   getAuthenticatorQueryFn,
   getAuthenticatorsQueryFn,
   getCurrentUserQueryFn,
@@ -54,7 +56,7 @@ import {
   getToolsQueryFn,
   getTtsConfigQueryFn,
   getTtsConfigsQueryFn,
-  getUsersQueryFn,
+  getConsoleUsersQueryFn,
   getVoiceAgentQueryFn,
   getVoiceAgentToolQueryFn,
   getVoiceAgentToolsQueryFn,
@@ -64,6 +66,7 @@ import {
   getWorkflowRunsQueryFn,
   getWorkflowsQueryFn,
   readYamlQueryFn,
+  getScheduledJobsQueryFn,
 } from './query-functions';
 import {
   getAgentKey,
@@ -74,6 +77,7 @@ import {
   getApiServiceKey,
   getApiServicesKey,
   getAppByIdKey,
+  getAppUsersKey,
   getAuthenticatorKey,
   getAuthenticatorsKey,
   getCurrentUserKey,
@@ -100,7 +104,7 @@ import {
   getToolsKey,
   getTtsConfigKey,
   getTtsConfigsKey,
-  getUsersKey,
+  getConsoleUsersKey,
   getVoiceAgentKey,
   getVoiceAgentToolKey,
   getVoiceAgentToolsKey,
@@ -110,6 +114,7 @@ import {
   getWorkflowRunsKey,
   getWorkflowsKey,
   readYamlKey,
+  getScheduledJobsKey,
 } from './query-keys';
 
 export const useGetAllApps = (enabled: boolean): UseQueryResult<App[], Error> => {
@@ -417,8 +422,16 @@ export const useGetAppById = (appId: string, enabled: boolean = true): UseQueryR
   return useQueryInit<App | undefined>(getAppByIdKey(appId), () => getAppByIdFn(appId), enabled);
 };
 
-export const useGetUsers = (): UseQueryResult<IUser[], Error> => {
-  return useQueryInit(getUsersKey(), getUsersQueryFn, true);
+export const useGetAppUsers = (appId: string | undefined): UseQueryResult<IUser[], Error> => {
+  return useQueryInit(getAppUsersKey(appId || ''), () => getAppUsersQueryFn(), !!appId);
+};
+
+export const useGetConsoleUsers = (): UseQueryResult<IUser[], Error> => {
+  return useQueryInit(getConsoleUsersKey(), getConsoleUsersQueryFn, true);
+};
+
+export const useGetScheduledJobs = (appId: string | undefined): UseQueryResult<ScheduledJob[], Error> => {
+  return useQueryInit(getScheduledJobsKey(appId || ''), getScheduledJobsQueryFn, !!appId);
 };
 
 // Voice Agent Tools Hooks
diff --git a/wavefront/client/src/hooks/data/mutation-hooks.ts b/wavefront/client/src/hooks/data/mutation-hooks.ts
index 287bec1f..1482f0e2 100644
--- a/wavefront/client/src/hooks/data/mutation-hooks.ts
+++ b/wavefront/client/src/hooks/data/mutation-hooks.ts
@@ -1,5 +1,5 @@
 import { QueryClient, useMutation, useQueryClient } from '@tanstack/react-query';
-import { getAgentKey, getAgentsKey, getAppByIdKey, getUserKey, getUsersKey } from './query-keys';
+import { getAgentKey, getAgentsKey, getAppByIdKey, getConsoleUsersKey, getUserKey } from './query-keys';
 import {
   createUserMutationFn,
   deleteAgentMutationFn,
@@ -90,7 +90,7 @@ export const useCreateUser = () => {
     mutationFn: createUserMutationFn,
     onSuccess: () => {
       notifySuccess('User created successfully');
-      queryClient.invalidateQueries({ queryKey: getUsersKey() });
+      queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
     },
     onError: (error) => {
       console.error('Error creating user:', error);
@@ -108,7 +108,7 @@ export const useUpdateUser = (userId: string | undefined) => {
     mutationFn: updateUserMutationFn,
     onSuccess: () => {
       notifySuccess('User updated successfully');
-      queryClient.invalidateQueries({ queryKey: getUsersKey() });
+      queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
       if (userId) {
         queryClient.invalidateQueries({ queryKey: getUserKey(userId) });
       }
@@ -129,7 +129,7 @@ export const useDeleteUser = () => {
     mutationFn: deleteUserMutationFn,
     onSuccess: () => {
       notifySuccess('User deleted successfully');
-      queryClient.invalidateQueries({ queryKey: getUsersKey() });
+      queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
     },
     onError: (error) => {
       console.error('Error deleting user:', error);
diff --git a/wavefront/client/src/hooks/data/query-functions.ts b/wavefront/client/src/hooks/data/query-functions.ts
index 4b463c6f..5e3c23c3 100644
--- a/wavefront/client/src/hooks/data/query-functions.ts
+++ b/wavefront/client/src/hooks/data/query-functions.ts
@@ -15,8 +15,12 @@ import { ToolDetails, VoiceAgentTool, VoiceAgentToolWithAssociation } from '@app
 import { TtsConfig } from '@app/types/tts-config';
 import { IUser } from '@app/types/user';
 import { VoiceAgent } from '@app/types/voice-agent';
+import { ScheduledJob } from '@app/types/scheduled-job';
 import { WorkflowListItem, WorkflowPipelineListItem, WorkflowRunListData } from '@app/types/workflow';
 
+const SCHEDULED_JOBS_PAGE_SIZE = 20;
+const MAX_SCHEDULED_JOBS = 1000;
+
 const getAllAppsQueryFn = async () => {
   const {
     data: { data = { apps: [] } },
@@ -396,7 +400,15 @@ const getAgentToolsQueryFn = async (agentId: string): Promise<VoiceAgentToolWith
   return [];
 };
 
-const getUsersQueryFn = async (): Promise<IUser[]> => {
+const getAppUsersQueryFn = async (): Promise<IUser[]> => {
+  const response = await floConsoleService.appUserService.listAppUsers();
+  if (response.data?.data?.users && Array.isArray(response.data.data.users)) {
+    return response.data.data.users;
+  }
+  return [];
+};
+
+const getConsoleUsersQueryFn = async (): Promise<IUser[]> => {
   const response = await floConsoleService.userService.listUsers();
   if (response.data?.data?.users && Array.isArray(response.data.data.users)) {
     return response.data.data.users;
@@ -404,6 +416,26 @@ const getUsersQueryFn = async (): Promise<IUser[]> => {
   return [];
 };
 
+const getScheduledJobsQueryFn = async (): Promise<ScheduledJob[]> => {
+  const jobs: ScheduledJob[] = [];
+  let offset = 0;
+
+  while (jobs.length < MAX_SCHEDULED_JOBS) {
+    const response = await floConsoleService.scheduledJobService.listScheduledJobs({
+      limit: SCHEDULED_JOBS_PAGE_SIZE,
+      offset,
+    });
+    const page = response.data.data?.jobs ?? [];
+    jobs.push(...page);
+    if (page.length < SCHEDULED_JOBS_PAGE_SIZE) {
+      break;
+    }
+    offset += SCHEDULED_JOBS_PAGE_SIZE;
+  }
+
+  return jobs.slice(0, MAX_SCHEDULED_JOBS);
+};
+
 export {
   getAgentQueryFn,
   getAgentsQueryFn,
@@ -414,6 +446,7 @@ export {
   getApiServiceQueryFn,
   getApiServicesQueryFn,
   getAppByIdFn,
+  getAppUsersQueryFn,
   getAuthenticatorQueryFn,
   getAuthenticatorsQueryFn,
   getCurrentUserQueryFn,
@@ -440,7 +473,7 @@ export {
   getToolsQueryFn,
   getTtsConfigQueryFn,
   getTtsConfigsQueryFn,
-  getUsersQueryFn,
+  getConsoleUsersQueryFn,
   getVoiceAgentQueryFn,
   getVoiceAgentToolQueryFn,
   getVoiceAgentToolsQueryFn,
@@ -449,4 +482,5 @@ export {
   getWorkflowRunsQueryFn,
   getWorkflowsQueryFn,
   readYamlQueryFn,
+  getScheduledJobsQueryFn,
 };
diff --git a/wavefront/client/src/hooks/data/query-keys.ts b/wavefront/client/src/hooks/data/query-keys.ts
index b7cddee6..db29f6fb 100644
--- a/wavefront/client/src/hooks/data/query-keys.ts
+++ b/wavefront/client/src/hooks/data/query-keys.ts
@@ -62,11 +62,13 @@ const getPipelinesKey = (appId: string, statusFilter?: string) => {
 const getPipelineKey = (appId: string, pipelineId: string) => ['pipeline', appId, pipelineId];
 const getPipelineFilesKey = (appId: string, pipelineId: string) => ['pipeline-files', appId, pipelineId];
 const getAppByIdKey = (appId: string) => ['app-by-id', appId];
-const getUsersKey = () => ['users'];
+const getAppUsersKey = (appId: string) => ['app-users', appId];
+const getConsoleUsersKey = () => ['console-users'];
 const getUserKey = (userId: string) => ['user', userId];
 const getVoiceAgentToolsKey = (appId: string) => ['voice-agent-tools', appId];
 const getVoiceAgentToolKey = (appId: string, toolId: string) => ['voice-agent-tool', appId, toolId];
 const getAgentToolsKey = (appId: string, agentId: string) => ['agent-tools', appId, agentId];
+const getScheduledJobsKey = (appId: string) => ['scheduled-jobs', appId];
 
 export {
   getAgentKey,
@@ -105,7 +107,7 @@ export {
   getTtsConfigKey,
   getTtsConfigsKey,
   getUserKey,
-  getUsersKey,
+  getConsoleUsersKey,
   getVoiceAgentKey,
   getVoiceAgentToolKey,
   getVoiceAgentToolsKey,
@@ -114,4 +116,6 @@ export {
   getWorkflowRunsKey,
   getWorkflowsKey,
   getAppByIdKey,
+  getAppUsersKey,
+  getScheduledJobsKey,
 };
diff --git a/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx b/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx
deleted file mode 100644
index aefb1cb8..00000000
--- a/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx
+++ /dev/null
@@ -1,393 +0,0 @@
-import { Button } from '@app/components/ui/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@app/components/ui/dialog';
-import { Input } from '@app/components/ui/input';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
-import { Textarea } from '@app/components/ui/textarea';
-import { useNotifyStore } from '@app/store';
-import { ScheduledJob } from '@app/types/scheduled-job';
-import floConsoleService from '@app/api';
-import { useEffect, useMemo, useState } from 'react';
-
-interface ScheduleEmailAlertDialogProps {
-  isOpen: boolean;
-  datasourceId: string;
-  queryId: string;
-  onOpenChange: (open: boolean) => void;
-}
-
-const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
-  isOpen,
-  datasourceId,
-  queryId,
-  onOpenChange,
-}) => {
-  const { notifySuccess, notifyError } = useNotifyStore();
-  const [jobs, setJobs] = useState<ScheduledJob[]>([]);
-  const [loadingJobs, setLoadingJobs] = useState(false);
-  const [cronExpr, setCronExpr] = useState('0 9 * * *');
-  const [timezone, setTimezone] = useState('Asia/Kolkata');
-  const [recipientsText, setRecipientsText] = useState('');
-  const [subject, setSubject] = useState('');
-  const [queryParamsJson, setQueryParamsJson] = useState('');
-  const [dateRange, setDateRange] = useState<'none' | 'last_day' | 'last_hour' | 'last_7_days' | 'last_30_days'>(
-    'none'
-  );
-  const [startDateParamKey, setStartDateParamKey] = useState('start_date');
-  const [endDateParamKey, setEndDateParamKey] = useState('end_date');
-  const [maxRetries, setMaxRetries] = useState('3');
-  const [editingJobId, setEditingJobId] = useState<string | null>(null);
-  const [saving, setSaving] = useState(false);
-  const [error, setError] = useState('');
-
-  const recipients = useMemo(
-    () =>
-      recipientsText
-        .split(',')
-        .map((email) => email.trim())
-        .filter(Boolean),
-    [recipientsText]
-  );
-
-  const resetForm = () => {
-    setCronExpr('0 9 * * *');
-    setTimezone('Asia/Kolkata');
-    setRecipientsText('');
-    setSubject('');
-    setQueryParamsJson('');
-    setDateRange('none');
-    setStartDateParamKey('start_date');
-    setEndDateParamKey('end_date');
-    setMaxRetries('3');
-    setEditingJobId(null);
-    setError('');
-  };
-
-  const fetchJobs = async () => {
-    if (!datasourceId || !queryId) return;
-    setLoadingJobs(true);
-    try {
-      const response = await floConsoleService.scheduledJobService.listScheduledJobs({
-        limit: 100,
-        query_id: queryId,
-        datasource_id: datasourceId,
-      });
-      setJobs(response.data.data?.jobs || []);
-    } catch {
-      notifyError('Failed to fetch existing schedules');
-    } finally {
-      setLoadingJobs(false);
-    }
-  };
-
-  useEffect(() => {
-    if (isOpen) {
-      void fetchJobs();
-    } else {
-      setJobs([]);
-      resetForm();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isOpen, datasourceId, queryId]);
-
-  const handleOpenChange = (open: boolean) => {
-    if (!open && !saving) {
-      resetForm();
-    }
-    onOpenChange(open);
-  };
-
-  const handleSave = async () => {
-    const retries = Number(maxRetries);
-    if (!cronExpr.trim()) {
-      setError('Cron expression is required');
-      return;
-    }
-    if (!timezone.trim()) {
-      setError('Timezone is required');
-      return;
-    }
-    if (recipients.length === 0) {
-      setError('At least one recipient email is required');
-      return;
-    }
-    if (!Number.isInteger(retries) || retries < 0 || retries > 10) {
-      setError('Max retries must be an integer between 0 and 10');
-      return;
-    }
-    let parsedParams: Record<string, unknown> | undefined;
-    if (queryParamsJson.trim()) {
-      try {
-        const value = JSON.parse(queryParamsJson);
-        if (typeof value !== 'object' || value === null || Array.isArray(value)) {
-          setError('Query params must be a JSON object');
-          return;
-        }
-        parsedParams = value as Record<string, unknown>;
-      } catch {
-        setError('Query params must be valid JSON (object)');
-        return;
-      }
-    }
-
-    setSaving(true);
-    setError('');
-    try {
-      if (editingJobId) {
-        await floConsoleService.scheduledJobService.updateScheduledJob(editingJobId, {
-          cron_expr: cronExpr.trim(),
-          timezone: timezone.trim(),
-          max_retries: retries,
-          payload: {
-            datasource_id: datasourceId,
-            query_id: queryId,
-            recipients,
-            subject: subject.trim() || undefined,
-            date_range: dateRange === 'none' ? undefined : dateRange,
-            start_date_param: dateRange === 'none' ? undefined : startDateParamKey.trim() || 'start_date',
-            end_date_param: dateRange === 'none' ? undefined : endDateParamKey.trim() || 'end_date',
-            params: parsedParams,
-          },
-        });
-        notifySuccess('Schedule updated successfully');
-      } else {
-        await floConsoleService.scheduledJobService.createScheduledJob({
-          job_type: 'email_dynamic_query',
-          cron_expr: cronExpr.trim(),
-          timezone: timezone.trim(),
-          max_retries: retries,
-          payload: {
-            datasource_id: datasourceId,
-            query_id: queryId,
-            recipients,
-            subject: subject.trim() || undefined,
-            date_range: dateRange === 'none' ? undefined : dateRange,
-            start_date_param: dateRange === 'none' ? undefined : startDateParamKey.trim() || 'start_date',
-            end_date_param: dateRange === 'none' ? undefined : endDateParamKey.trim() || 'end_date',
-            params: parsedParams,
-          },
-        });
-        notifySuccess('Email alert scheduled successfully');
-      }
-      resetForm();
-      await fetchJobs();
-    } catch {
-      setError('Unable to create schedule. Please verify the details and try again.');
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  const handleEdit = (job: ScheduledJob) => {
-    setEditingJobId(job.id);
-    setCronExpr(job.cron_expr || '0 9 * * *');
-    setTimezone(job.timezone || 'Asia/Kolkata');
-    setMaxRetries(String(job.max_retries ?? 3));
-    const payload = (job.payload || {}) as Record<string, unknown>;
-    const recipients = Array.isArray(payload.recipients) ? payload.recipients : [];
-    setRecipientsText(recipients.map((item) => String(item)).join(', '));
-    setSubject(typeof payload.subject === 'string' ? payload.subject : '');
-    const paramsValue = payload.params;
-    const dateRangeValue = payload.date_range;
-    if (
-      dateRangeValue === 'last_day' ||
-      dateRangeValue === 'last_hour' ||
-      dateRangeValue === 'last_7_days' ||
-      dateRangeValue === 'last_30_days'
-    ) {
-      setDateRange(dateRangeValue);
-    } else {
-      setDateRange('none');
-    }
-    setStartDateParamKey(typeof payload.start_date_param === 'string' ? payload.start_date_param : 'start_date');
-    setEndDateParamKey(typeof payload.end_date_param === 'string' ? payload.end_date_param : 'end_date');
-    if (paramsValue && typeof paramsValue === 'object' && !Array.isArray(paramsValue)) {
-      setQueryParamsJson(JSON.stringify(paramsValue, null, 2));
-    } else {
-      setQueryParamsJson('');
-    }
-  };
-
-  const handleDelete = async (jobId: string) => {
-    setSaving(true);
-    try {
-      await floConsoleService.scheduledJobService.deleteScheduledJob(jobId);
-      notifySuccess('Schedule deleted successfully');
-      if (editingJobId === jobId) {
-        resetForm();
-      }
-      await fetchJobs();
-    } catch {
-      notifyError('Failed to delete schedule');
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  return (
-    <Dialog open={isOpen} onOpenChange={handleOpenChange}>
-      <DialogContent className="max-h-[90vh] max-w-[800px] overflow-y-auto">
-        <DialogHeader>
-          <DialogTitle>Schedule Email Alert</DialogTitle>
-          <DialogDescription>Create a scheduled query email for this dynamic query.</DialogDescription>
-        </DialogHeader>
-
-        <div className="grid grid-cols-1 gap-5">
-          <div className="rounded-lg border border-[#EFF0F1] bg-[#FBFBFB] p-4">
-            <div className="mb-3 flex items-center justify-between">
-              <p className="text-sm font-semibold text-[#282828]">Existing schedules for this query</p>
-              <Button
-                variant="outline"
-                onClick={() => {
-                  resetForm();
-                }}
-                disabled={saving}
-              >
-                New Schedule
-              </Button>
-            </div>
-            {loadingJobs ? (
-              <p className="text-sm text-[#878787]">Loading schedules...</p>
-            ) : jobs.length === 0 ? (
-              <p className="text-sm text-[#878787]">No schedules found for this dynamic query.</p>
-            ) : (
-              <div className="flex flex-col gap-2">
-                {jobs.map((job) => (
-                  <div
-                    key={job.id}
-                    className="flex items-center justify-between rounded-md border border-[#EFF0F1] bg-white p-3"
-                  >
-                    <div className="text-xs text-[#282828]">
-                      <p>
-                        <span className="font-medium">Cron:</span> {job.cron_expr} ({job.timezone})
-                      </p>
-                      <p>
-                        <span className="font-medium">Status:</span> {job.status}
-                      </p>
-                      <p>
-                        <span className="font-medium">Next Run:</span>{' '}
-                        {job.next_run_at ? new Date(job.next_run_at).toLocaleString() : '-'}
-                      </p>
-                    </div>
-                    <div className="flex gap-2">
-                      <Button variant="outline" onClick={() => handleEdit(job)} disabled={saving}>
-                        Edit
-                      </Button>
-                      <Button
-                        variant="destructive"
-                        onClick={() => {
-                          void handleDelete(job.id);
-                        }}
-                        disabled={saving}
-                      >
-                        Delete
-                      </Button>
-                    </div>
-                  </div>
-                ))}
-              </div>
-            )}
-          </div>
-
-          <div className="grid grid-cols-2 gap-3">
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Datasource ID</p>
-              <Input value={datasourceId} disabled />
-            </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Query ID</p>
-              <Input value={queryId} disabled />
-            </div>
-          </div>
-
-          <div className="grid grid-cols-2 gap-3">
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Cron expression</p>
-              <Input value={cronExpr} onChange={(e) => setCronExpr(e.target.value)} placeholder="0 9 * * *" />
-            </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Timezone</p>
-              <Input value={timezone} onChange={(e) => setTimezone(e.target.value)} placeholder="Asia/Kolkata" />
-            </div>
-          </div>
-
-          <div className="grid grid-cols-2 gap-3">
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Max retries</p>
-              <Input value={maxRetries} onChange={(e) => setMaxRetries(e.target.value)} placeholder="3" />
-            </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Subject (optional)</p>
-              <Input value={subject} onChange={(e) => setSubject(e.target.value)} placeholder="Daily report" />
-            </div>
-          </div>
-
-          <div>
-            <p className="mb-1 text-xs text-[#878787]">Recipients (comma-separated emails)</p>
-            <Textarea
-              value={recipientsText}
-              onChange={(e) => setRecipientsText(e.target.value)}
-              placeholder="user1@company.com, user2@company.com"
-              className="min-h-[90px]"
-            />
-          </div>
-
-          <div>
-            <p className="mb-1 text-xs text-[#878787]">Query params (optional JSON)</p>
-            <Textarea
-              value={queryParamsJson}
-              onChange={(e) => setQueryParamsJson(e.target.value)}
-              placeholder={'{"start_date":"2026-03-01","end_date":"2026-03-31"}'}
-              className="min-h-[90px] font-mono"
-            />
-          </div>
-
-          <div className="grid grid-cols-3 gap-3">
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Dynamic date range (optional)</p>
-              <Select value={dateRange} onValueChange={(v) => setDateRange(v as typeof dateRange)}>
-                <SelectTrigger>
-                  <SelectValue placeholder="Select range" />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectItem value="none">None</SelectItem>
-                  <SelectItem value="last_day">Last day</SelectItem>
-                  <SelectItem value="last_hour">Last hour</SelectItem>
-                  <SelectItem value="last_7_days">Last 7 days</SelectItem>
-                  <SelectItem value="last_30_days">Last 30 days</SelectItem>
-                </SelectContent>
-              </Select>
-            </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Start date param key</p>
-              <Input value={startDateParamKey} onChange={(e) => setStartDateParamKey(e.target.value)} />
-            </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">End date param key</p>
-              <Input value={endDateParamKey} onChange={(e) => setEndDateParamKey(e.target.value)} />
-            </div>
-          </div>
-
-          {error ? <p className="text-sm text-red-500">{error}</p> : null}
-        </div>
-
-        <DialogFooter>
-          <Button variant="outline" onClick={() => handleOpenChange(false)} disabled={saving}>
-            Cancel
-          </Button>
-          <Button onClick={handleSave} loading={saving} disabled={saving}>
-            {editingJobId ? 'Update Schedule' : 'Create Schedule'}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default ScheduleEmailAlertDialog;
diff --git a/wavefront/client/src/pages/apps/[appId]/datasources/Yamls.tsx b/wavefront/client/src/pages/apps/[appId]/datasources/Yamls.tsx
index 60ecfced..5d799e9c 100644
--- a/wavefront/client/src/pages/apps/[appId]/datasources/Yamls.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/datasources/Yamls.tsx
@@ -6,14 +6,12 @@ const Yamls = ({
   yamls,
   setYamlCrud,
   setSelectedYaml,
-  onSchedule,
 }: {
   yamls: Yaml[];
   setYamlCrud: React.Dispatch<
     React.SetStateAction<{ view: boolean; edit: boolean; create: boolean; delete: boolean; execute: boolean }>
   >;
   setSelectedYaml: React.Dispatch<React.SetStateAction<string | null>>;
-  onSchedule: (filePath: string) => void;
 }) => {
   const setOnly = (
     key: keyof { view: boolean; edit: boolean; create: boolean; delete: boolean; execute: boolean },
@@ -74,25 +72,14 @@ const Yamls = ({
             </Button>
           </div>
           <div className="flex justify-end">
-            <div className="flex items-center gap-2">
-              <Button
-                variant="outline"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  onSchedule(yaml.file);
-                }}
-              >
-                Schedule Alert
-              </Button>
-              <Button
-                onClick={(e) => {
-                  e.stopPropagation();
-                  setOnly('execute', yaml.file);
-                }}
-              >
-                Execute
-              </Button>
-            </div>
+            <Button
+              onClick={(e) => {
+                e.stopPropagation();
+                setOnly('execute', yaml.file);
+              }}
+            >
+              Execute
+            </Button>
           </div>
         </div>
       ))}
diff --git a/wavefront/client/src/pages/apps/[appId]/datasources/[datasourceId].tsx b/wavefront/client/src/pages/apps/[appId]/datasources/[datasourceId].tsx
index 82829ece..90854c13 100644
--- a/wavefront/client/src/pages/apps/[appId]/datasources/[datasourceId].tsx
+++ b/wavefront/client/src/pages/apps/[appId]/datasources/[datasourceId].tsx
@@ -19,7 +19,6 @@ import { useQueryClient } from '@tanstack/react-query';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useNavigate, useParams } from 'react-router';
 import EditDatasourceDialog from './EditDatasourceDialog';
-import ScheduleEmailAlertDialog from './ScheduleEmailAlertDialog';
 import YamlCreation from './YamlCreation';
 import Yamls from './Yamls';
 import YamlView from './YamlView';
@@ -76,8 +75,6 @@ const DatasourceDetail: React.FC = () => {
   const [testingConnection, setTestingConnection] = useState(false);
 
   const [yamlCreation, setYamlCreation] = useState<boolean>(false);
-  const [scheduleDialogOpen, setScheduleDialogOpen] = useState(false);
-  const [scheduleQueryId, setScheduleQueryId] = useState('');
   const [yamlContent, setYamlContent] = useState<string>('');
   const [yamlQueries, setYamlQueries] = useState<YamlReadData[]>([]);
   const [yamlName, setYamlName] = useState<string>('');
@@ -178,11 +175,6 @@ const DatasourceDetail: React.FC = () => {
     }
   };
 
-  const handleOpenScheduleDialog = (yamlFile: string) => {
-    setScheduleQueryId(yamlFile.split('.')[0]);
-    setScheduleDialogOpen(true);
-  };
-
   const handleEditSuccess = () => {
     queryClient.invalidateQueries({
       queryKey: getDatasourceKey(appId || '', datasourceId || ''),
@@ -306,12 +298,7 @@ const DatasourceDetail: React.FC = () => {
             </div>
             {/* Yamls component moved inside main container to get pb-10 padding */}
             {yamls && yamls.length > 0 && (
-              <Yamls
-                yamls={yamls}
-                setYamlCrud={setYamlCrud}
-                setSelectedYaml={setSelectedYaml}
-                onSchedule={handleOpenScheduleDialog}
-              />
+              <Yamls yamls={yamls} setYamlCrud={setYamlCrud} setSelectedYaml={setSelectedYaml} />
             )}
           </TabsContent>
         </Tabs>
@@ -365,15 +352,6 @@ const DatasourceDetail: React.FC = () => {
           executing={executing}
         />
 
-        {datasourceId && scheduleQueryId && (
-          <ScheduleEmailAlertDialog
-            isOpen={scheduleDialogOpen}
-            datasourceId={datasourceId}
-            queryId={scheduleQueryId}
-            onOpenChange={setScheduleDialogOpen}
-          />
-        )}
-
         {yamlCrud.delete && selectedYaml && (
           <DeleteConfirmationDialog
             isOpen={showDeleteConfirm}
diff --git a/wavefront/client/src/pages/apps/[appId]/scheduled-jobs/ScheduledJobFormDialog.tsx b/wavefront/client/src/pages/apps/[appId]/scheduled-jobs/ScheduledJobFormDialog.tsx
new file mode 100644
index 00000000..77fc7614
--- /dev/null
+++ b/wavefront/client/src/pages/apps/[appId]/scheduled-jobs/ScheduledJobFormDialog.tsx
@@ -0,0 +1,617 @@
+import floConsoleService from '@app/api';
+import { Badge } from '@app/components/ui/badge';
+import { Button } from '@app/components/ui/button';
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from '@app/components/ui/command';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@app/components/ui/dialog';
+import { Input } from '@app/components/ui/input';
+import { Popover, PopoverContent, PopoverTrigger } from '@app/components/ui/popover';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@app/components/ui/tabs';
+import { Textarea } from '@app/components/ui/textarea';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@app/components/ui/tooltip';
+import { useGetAllDatasources, useGetAllYamls, useGetAppUsers } from '@app/hooks';
+import { cn } from '@app/lib/utils';
+import { useNotifyStore } from '@app/store';
+import { ColumnStyleConfig, ScheduledJob } from '@app/types/scheduled-job';
+import { Check, ChevronDown, Info, X } from 'lucide-react';
+import { useEffect, useMemo, useState } from 'react';
+import {
+  buildEmailPayload,
+  extractRecipientUserIdsFromPayload,
+  formatUserLabel,
+  getDatasourceIdFromPayload,
+  getQueryIdsFromPayload,
+  normalizeUserId,
+  resolveUsersFromRecipientIds,
+} from './scheduled-job-utils';
+
+const COLUMN_STYLES_PLACEHOLDER = `[
+  {
+    "column": "Total calls attempted",
+    "rules": [
+      { "op": "eq", "value": 0, "fill": "light_red" },
+      { "op": "lt", "value": 160, "fill": "light_yellow" },
+      { "op": "gte", "value": 225, "fill": "dark_green" }
+    ]
+  }
+]`;
+
+interface ScheduledJobFormDialogProps {
+  isOpen: boolean;
+  appId: string;
+  job?: ScheduledJob | null;
+  onOpenChange: (open: boolean) => void;
+  onSuccess: () => void;
+}
+
+const ScheduledJobFormDialog: React.FC<ScheduledJobFormDialogProps> = ({
+  isOpen,
+  appId,
+  job,
+  onOpenChange,
+  onSuccess,
+}) => {
+  const { notifySuccess } = useNotifyStore();
+  const isEditing = Boolean(job?.id);
+  const { data: datasources = [] } = useGetAllDatasources(appId);
+  const { data: appUsers = [], isLoading: appUsersLoading } = useGetAppUsers(appId);
+
+  const [datasourceId, setDatasourceId] = useState('');
+  const [selectedQueryIds, setSelectedQueryIds] = useState<string[]>([]);
+  const { data: yamls = [], isLoading: yamlsLoading } = useGetAllYamls(appId, datasourceId || undefined);
+
+  const [cronExpr, setCronExpr] = useState('0 9 * * *');
+  const [timezone, setTimezone] = useState('Asia/Kolkata');
+  const [selectedRecipientUserIds, setSelectedRecipientUserIds] = useState<string[]>([]);
+  const [recipientsSelectOpen, setRecipientsSelectOpen] = useState(false);
+  const [subject, setSubject] = useState('');
+  const [emailContent, setEmailContent] = useState('');
+  const [queryParamsJson, setQueryParamsJson] = useState('');
+  const [columnStylesJson, setColumnStylesJson] = useState('');
+  const [dateRange, setDateRange] = useState<
+    'none' | 'last_day' | 't_2' | 'last_hour' | 'last_7_days' | 'last_30_days'
+  >('none');
+  const [startDateParamKey, setStartDateParamKey] = useState('start_date');
+  const [endDateParamKey, setEndDateParamKey] = useState('end_date');
+  const [maxRetries, setMaxRetries] = useState('3');
+  const [activeTab, setActiveTab] = useState<'schedule' | 'email'>('schedule');
+  const [saving, setSaving] = useState(false);
+  const [error, setError] = useState('');
+
+  const availableQueryIds = useMemo(
+    () => yamls.map((yaml) => yaml.file.split('.')[0]).filter((id) => id.length > 0),
+    [yamls]
+  );
+
+  const selectedRecipientUsers = useMemo(
+    () => resolveUsersFromRecipientIds(selectedRecipientUserIds, appUsers),
+    [selectedRecipientUserIds, appUsers]
+  );
+
+  const isRecipientSelected = (userId: string) =>
+    selectedRecipientUserIds.some((id) => normalizeUserId(id) === normalizeUserId(userId));
+
+  const toggleRecipientUser = (userId: string) => {
+    setSelectedRecipientUserIds((prev) =>
+      isRecipientSelected(userId)
+        ? prev.filter((id) => normalizeUserId(id) !== normalizeUserId(userId))
+        : [...prev, userId]
+    );
+  };
+
+  const removeRecipientUser = (userId: string) => {
+    setSelectedRecipientUserIds((prev) => prev.filter((id) => normalizeUserId(id) !== normalizeUserId(userId)));
+  };
+
+  const toggleQueryId = (queryId: string) => {
+    setSelectedQueryIds((prev) => (prev.includes(queryId) ? prev.filter((id) => id !== queryId) : [...prev, queryId]));
+  };
+
+  const resetForm = () => {
+    setDatasourceId('');
+    setSelectedQueryIds([]);
+    setCronExpr('0 9 * * *');
+    setTimezone('Asia/Kolkata');
+    setSelectedRecipientUserIds([]);
+    setSubject('');
+    setEmailContent('');
+    setQueryParamsJson('');
+    setColumnStylesJson('');
+    setDateRange('none');
+    setStartDateParamKey('start_date');
+    setEndDateParamKey('end_date');
+    setMaxRetries('3');
+    setActiveTab('schedule');
+    setError('');
+  };
+
+  const applyJobToForm = (existingJob: ScheduledJob) => {
+    const payload = (existingJob.payload || {}) as Record<string, unknown>;
+    setDatasourceId(getDatasourceIdFromPayload(payload));
+    setSelectedQueryIds(getQueryIdsFromPayload(payload));
+    setCronExpr(existingJob.cron_expr || '0 9 * * *');
+    setTimezone(existingJob.timezone || 'Asia/Kolkata');
+    setMaxRetries(String(existingJob.max_retries ?? 3));
+    setSelectedRecipientUserIds(extractRecipientUserIdsFromPayload(payload));
+    setSubject(typeof payload.subject === 'string' ? payload.subject : '');
+    setEmailContent(typeof payload.email_content === 'string' ? payload.email_content : '');
+    const paramsValue = payload.params;
+    const dateRangeValue = payload.date_range;
+    if (
+      dateRangeValue === 'last_day' ||
+      dateRangeValue === 't_2' ||
+      dateRangeValue === 'last_hour' ||
+      dateRangeValue === 'last_7_days' ||
+      dateRangeValue === 'last_30_days'
+    ) {
+      setDateRange(dateRangeValue);
+    } else {
+      setDateRange('none');
+    }
+    setStartDateParamKey(typeof payload.start_date_param === 'string' ? payload.start_date_param : 'start_date');
+    setEndDateParamKey(typeof payload.end_date_param === 'string' ? payload.end_date_param : 'end_date');
+    if (paramsValue && typeof paramsValue === 'object' && !Array.isArray(paramsValue)) {
+      setQueryParamsJson(JSON.stringify(paramsValue, null, 2));
+    } else {
+      setQueryParamsJson('');
+    }
+    const columnStylesValue = payload.column_styles;
+    if (Array.isArray(columnStylesValue) && columnStylesValue.length > 0) {
+      setColumnStylesJson(JSON.stringify(columnStylesValue, null, 2));
+    } else {
+      setColumnStylesJson('');
+    }
+    setError('');
+  };
+
+  useEffect(() => {
+    if (!isOpen) {
+      resetForm();
+      return;
+    }
+    if (job) {
+      applyJobToForm(job);
+    } else {
+      resetForm();
+    }
+  }, [isOpen, job]);
+
+  const handleOpenChange = (open: boolean) => {
+    if (!open && !saving) {
+      resetForm();
+    }
+    onOpenChange(open);
+  };
+
+  const handleSave = async () => {
+    const retries = Number(maxRetries);
+    if (!datasourceId.trim()) {
+      setError('Datasource is required');
+      setActiveTab('schedule');
+      return;
+    }
+    if (selectedQueryIds.length === 0) {
+      setError('Select at least one dynamic query');
+      setActiveTab('schedule');
+      return;
+    }
+    if (!cronExpr.trim()) {
+      setError('Cron expression is required');
+      setActiveTab('schedule');
+      return;
+    }
+    if (!timezone.trim()) {
+      setError('Timezone is required');
+      setActiveTab('schedule');
+      return;
+    }
+    if (selectedRecipientUserIds.length === 0) {
+      setError('At least one recipient user is required');
+      setActiveTab('email');
+      return;
+    }
+    if (!Number.isInteger(retries) || retries < 0 || retries > 10) {
+      setError('Max retries must be an integer between 0 and 10');
+      setActiveTab('schedule');
+      return;
+    }
+
+    let parsedParams: Record<string, unknown> | undefined;
+    if (queryParamsJson.trim()) {
+      try {
+        const value = JSON.parse(queryParamsJson);
+        if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+          setError('Query params must be a JSON object');
+          setActiveTab('schedule');
+          return;
+        }
+        parsedParams = value as Record<string, unknown>;
+      } catch {
+        setError('Query params must be valid JSON (object)');
+        setActiveTab('schedule');
+        return;
+      }
+    }
+
+    let parsedColumnStyles: ColumnStyleConfig[] | undefined;
+    if (columnStylesJson.trim()) {
+      try {
+        const value = JSON.parse(columnStylesJson);
+        if (!Array.isArray(value)) {
+          setError('Column styles must be a JSON array');
+          setActiveTab('email');
+          return;
+        }
+        parsedColumnStyles = value as ColumnStyleConfig[];
+      } catch {
+        setError('Column styles must be valid JSON (array)');
+        setActiveTab('email');
+        return;
+      }
+    }
+
+    const emailPayload = buildEmailPayload({
+      datasourceId: datasourceId.trim(),
+      queryIds: selectedQueryIds,
+      recipientUserIds: selectedRecipientUserIds,
+      subject: subject.trim() || undefined,
+      emailContent: emailContent.trim() || undefined,
+      columnStyles: parsedColumnStyles,
+      dateRange: dateRange === 'none' ? undefined : dateRange,
+      startDateParam: dateRange === 'none' ? undefined : startDateParamKey.trim() || 'start_date',
+      endDateParam: dateRange === 'none' ? undefined : endDateParamKey.trim() || 'end_date',
+      params: parsedParams,
+    });
+
+    setSaving(true);
+    setError('');
+    try {
+      if (isEditing && job) {
+        await floConsoleService.scheduledJobService.updateScheduledJob(job.id, {
+          cron_expr: cronExpr.trim(),
+          timezone: timezone.trim(),
+          max_retries: retries,
+          payload: emailPayload,
+        });
+        notifySuccess('Scheduled job updated successfully');
+      } else {
+        await floConsoleService.scheduledJobService.createScheduledJob({
+          job_type: 'email_dynamic_query',
+          cron_expr: cronExpr.trim(),
+          timezone: timezone.trim(),
+          max_retries: retries,
+          payload: emailPayload,
+        });
+        notifySuccess('Scheduled job created successfully');
+      }
+      onSuccess();
+      handleOpenChange(false);
+    } catch {
+      setError('Unable to save scheduled job. Please verify the details and try again.');
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  return (
+    <Dialog open={isOpen} onOpenChange={handleOpenChange}>
+      <DialogContent className="max-h-[90vh] overflow-y-auto lg:max-w-[800px] xl:max-w-[1000px]">
+        <DialogHeader>
+          <DialogTitle>{isEditing ? 'Edit Scheduled Job' : 'Create Scheduled Job'}</DialogTitle>
+          <DialogDescription>
+            Schedule one or more dynamic query reports to be emailed on a cron schedule.
+          </DialogDescription>
+        </DialogHeader>
+
+        <Tabs value={activeTab} onValueChange={(value) => setActiveTab(value as 'schedule' | 'email')}>
+          <TabsList className="grid w-full grid-cols-2">
+            <TabsTrigger value="schedule">Schedule</TabsTrigger>
+            <TabsTrigger value="email">Email</TabsTrigger>
+          </TabsList>
+
+          <TabsContent value="schedule" className="mt-4 space-y-5">
+            <div className="grid grid-cols-2 gap-3">
+              <div>
+                <p className="mb-1 text-xs text-[#878787]">Datasource</p>
+                <Select
+                  value={datasourceId}
+                  onValueChange={(value) => {
+                    setDatasourceId(value);
+                    if (!job || getDatasourceIdFromPayload(job.payload || {}) !== value) {
+                      setSelectedQueryIds([]);
+                    }
+                  }}
+                >
+                  <SelectTrigger>
+                    <SelectValue placeholder="Select datasource" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {datasources.map((ds) => (
+                      <SelectItem key={ds.id} value={ds.id}>
+                        {ds.name || ds.id}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              </div>
+              <div>
+                <p className="mb-1 text-xs text-[#878787]">Max retries</p>
+                <Input value={maxRetries} onChange={(e) => setMaxRetries(e.target.value)} placeholder="3" />
+              </div>
+            </div>
+
+            <div>
+              <p className="mb-2 text-xs text-[#878787]">
+                Dynamic queries (select one or more — each becomes an attachment in the email)
+              </p>
+              {!datasourceId ? (
+                <p className="text-sm text-[#878787]">Select a datasource to load queries.</p>
+              ) : yamlsLoading ? (
+                <p className="text-sm text-[#878787]">Loading queries...</p>
+              ) : availableQueryIds.length === 0 ? (
+                <p className="text-sm text-[#878787]">No dynamic queries found for this datasource.</p>
+              ) : (
+                <div className="flex max-h-40 flex-wrap gap-2 overflow-y-auto rounded-md border border-[#EFF0F1] bg-[#FBFBFB] p-3">
+                  {availableQueryIds.map((queryId) => {
+                    const selected = selectedQueryIds.includes(queryId);
+                    return (
+                      <button
+                        key={queryId}
+                        type="button"
+                        onClick={() => toggleQueryId(queryId)}
+                        className={cn(
+                          'rounded-full border px-3 py-1 text-xs transition-colors',
+                          selected
+                            ? 'border-[#282828] bg-[#282828] text-white'
+                            : 'border-[#EFF0F1] bg-white text-[#282828] hover:border-[#282828]'
+                        )}
+                      >
+                        {queryId}
+                      </button>
+                    );
+                  })}
+                </div>
+              )}
+            </div>
+
+            <div className="grid grid-cols-2 gap-3">
+              <div>
+                <p className="mb-1 text-xs text-[#878787]">Cron expression</p>
+                <Input value={cronExpr} onChange={(e) => setCronExpr(e.target.value)} placeholder="0 9 * * *" />
+              </div>
+              <div>
+                <p className="mb-1 text-xs text-[#878787]">Timezone</p>
+                <Input value={timezone} onChange={(e) => setTimezone(e.target.value)} placeholder="Asia/Kolkata" />
+              </div>
+            </div>
+
+            <div className="grid grid-cols-3 gap-3">
+              <div>
+                <p className="mb-1 text-xs text-[#878787]">Dynamic date range (optional)</p>
+                <Select value={dateRange} onValueChange={(v) => setDateRange(v as typeof dateRange)}>
+                  <SelectTrigger>
+                    <SelectValue placeholder="Select range" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value="none">None</SelectItem>
+                    <SelectItem value="last_hour">Last hour</SelectItem>
+                    <SelectItem value="last_day">Last day</SelectItem>
+                    <SelectItem value="t_2">T-2 (2 days ago)</SelectItem>
+                    <SelectItem value="last_7_days">Last 7 days</SelectItem>
+                    <SelectItem value="last_30_days">Last 30 days</SelectItem>
+                  </SelectContent>
+                </Select>
+              </div>
+              <div>
+                <p className="mb-1 text-xs text-[#878787]">Start date param key</p>
+                <Input value={startDateParamKey} onChange={(e) => setStartDateParamKey(e.target.value)} />
+              </div>
+              <div>
+                <p className="mb-1 text-xs text-[#878787]">End date param key</p>
+                <Input value={endDateParamKey} onChange={(e) => setEndDateParamKey(e.target.value)} />
+              </div>
+            </div>
+
+            <div>
+              <p className="mb-1 text-xs text-[#878787]">Query params (optional JSON)</p>
+              <Textarea
+                value={queryParamsJson}
+                onChange={(e) => setQueryParamsJson(e.target.value)}
+                placeholder={'{"start_date":"2026-03-01","end_date":"2026-03-31"}'}
+                className="min-h-[90px] font-mono"
+              />
+            </div>
+          </TabsContent>
+
+          <TabsContent value="email" className="mt-4 space-y-5">
+            <TooltipProvider delayDuration={200}>
+              <div>
+                <p className="mb-1 text-xs text-[#878787]">Subject (optional)</p>
+                <Input value={subject} onChange={(e) => setSubject(e.target.value)} placeholder="Daily report" />
+              </div>
+
+              <div className="grid grid-cols-2 gap-3">
+                <div>
+                  <div className="mb-1 flex items-center gap-1.5">
+                    <p className="text-xs text-[#878787]">Email content (optional)</p>
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <button
+                          type="button"
+                          className="inline-flex cursor-pointer text-[#878787] hover:text-[#555555]"
+                          aria-label="Email content help"
+                        >
+                          <Info className="h-3.5 w-3.5" />
+                        </button>
+                      </TooltipTrigger>
+                      <TooltipContent side="top" className="max-w-md">
+                        {`Use {query_id} placeholders to embed result tables inline (e.g. {sales_summary}). Plain text or HTML. Excel files are still attached when under the size limit. Leave empty for the default summary.`}
+                      </TooltipContent>
+                    </Tooltip>
+                  </div>
+                  <Textarea
+                    value={emailContent}
+                    onChange={(e) => setEmailContent(e.target.value)}
+                    placeholder={`Here is your result\n{my_query_id}\n\nSee more\n{another_query_id}`}
+                    className="min-h-[120px]"
+                  />
+                </div>
+
+                <div>
+                  <div className="mb-1 flex items-center gap-1.5">
+                    <p className="text-xs text-[#878787]">Column styles (optional JSON)</p>
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <button
+                          type="button"
+                          className="inline-flex cursor-pointer text-[#878787] hover:text-[#555555]"
+                          aria-label="Column styles help"
+                        >
+                          <Info className="h-3.5 w-3.5" />
+                        </button>
+                      </TooltipTrigger>
+                      <TooltipContent side="top" className="max-w-xs">
+                        Rules are evaluated top-to-bottom; first match wins.
+                      </TooltipContent>
+                    </Tooltip>
+                  </div>
+                  <Textarea
+                    value={columnStylesJson}
+                    onChange={(e) => setColumnStylesJson(e.target.value)}
+                    placeholder={COLUMN_STYLES_PLACEHOLDER}
+                    className="min-h-[120px] font-mono text-xs"
+                  />
+                </div>
+              </div>
+
+              <div>
+                <div className="mb-1 flex items-center gap-1.5">
+                  <p className="text-xs text-[#878787]">Recipient users</p>
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <button
+                        type="button"
+                        className="inline-flex cursor-pointer text-[#878787] hover:text-[#555555]"
+                        aria-label="Recipient users help"
+                      >
+                        <Info className="h-3.5 w-3.5" />
+                      </button>
+                    </TooltipTrigger>
+                    <TooltipContent side="top" className="max-w-xs">
+                      Each user receives reports filtered by their data access (RLS).
+                    </TooltipContent>
+                  </Tooltip>
+                </div>
+                <Popover modal open={recipientsSelectOpen} onOpenChange={setRecipientsSelectOpen}>
+                  <PopoverTrigger asChild>
+                    <button
+                      type="button"
+                      role="combobox"
+                      aria-expanded={recipientsSelectOpen}
+                      disabled={appUsersLoading}
+                      className={cn(
+                        'border-input ring-offset-background focus:ring-ring flex min-h-9 w-full items-center justify-between rounded-md border bg-white px-3 py-2 text-sm shadow-sm focus:ring-1 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50',
+                        selectedRecipientUserIds.length === 0 && 'text-[#878787]'
+                      )}
+                    >
+                      <span className="truncate text-left">
+                        {appUsersLoading
+                          ? 'Loading users...'
+                          : selectedRecipientUserIds.length === 0
+                            ? 'Select recipient users'
+                            : selectedRecipientUsers.length <= 2
+                              ? selectedRecipientUsers.map((u) => formatUserLabel(u)).join(', ')
+                              : `${selectedRecipientUsers.length} users selected`}
+                      </span>
+                      <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+                    </button>
+                  </PopoverTrigger>
+                  <PopoverContent className="w-(--radix-popover-trigger-width) p-0" align="start">
+                    <Command>
+                      <CommandInput placeholder="Search users..." />
+                      <CommandList>
+                        <CommandEmpty>No users found.</CommandEmpty>
+                        {selectedRecipientUsers.length > 0 ? (
+                          <CommandGroup heading="Selected">
+                            {selectedRecipientUsers.map((user) => (
+                              <CommandItem
+                                key={`selected-${user.id}`}
+                                value={`selected-${user.id}-${user.email}`}
+                                onSelect={() => toggleRecipientUser(user.id)}
+                              >
+                                <Check className="mr-2 h-4 w-4 shrink-0 opacity-100" />
+                                {formatUserLabel(user)}
+                              </CommandItem>
+                            ))}
+                          </CommandGroup>
+                        ) : null}
+                        <CommandGroup heading="All users">
+                          {appUsers
+                            .filter((user) => !isRecipientSelected(user.id))
+                            .map((user) => (
+                              <CommandItem
+                                key={user.id}
+                                value={`${user.first_name} ${user.last_name} ${user.email}`}
+                                onSelect={() => toggleRecipientUser(user.id)}
+                              >
+                                <Check className="mr-2 h-4 w-4 shrink-0 opacity-0" />
+                                {formatUserLabel(user)}
+                              </CommandItem>
+                            ))}
+                        </CommandGroup>
+                      </CommandList>
+                    </Command>
+                  </PopoverContent>
+                </Popover>
+                {selectedRecipientUsers.length > 0 ? (
+                  <div className="mt-2 flex gap-2 overflow-x-auto pb-1">
+                    {selectedRecipientUsers.map((user) => (
+                      <Badge key={user.id} variant="secondary" className="shrink-0 gap-1 pr-1 font-normal">
+                        <span className="max-w-[240px] truncate">{formatUserLabel(user)}</span>
+                        <button
+                          type="button"
+                          className="rounded-full p-0.5 hover:bg-black/10"
+                          aria-label={`Remove ${formatUserLabel(user)}`}
+                          onClick={() => removeRecipientUser(user.id)}
+                        >
+                          <X className="h-3 w-3" />
+                        </button>
+                      </Badge>
+                    ))}
+                  </div>
+                ) : null}
+              </div>
+            </TooltipProvider>
+          </TabsContent>
+        </Tabs>
+
+        {error ? <p className="text-sm text-red-500">{error}</p> : null}
+
+        <DialogFooter>
+          <Button variant="outline" onClick={() => handleOpenChange(false)} disabled={saving}>
+            Cancel
+          </Button>
+          <Button onClick={handleSave} loading={saving} disabled={saving}>
+            {isEditing ? 'Update' : 'Create'}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export default ScheduledJobFormDialog;
diff --git a/wavefront/client/src/pages/apps/[appId]/scheduled-jobs/index.tsx b/wavefront/client/src/pages/apps/[appId]/scheduled-jobs/index.tsx
new file mode 100644
index 00000000..1c82ebcd
--- /dev/null
+++ b/wavefront/client/src/pages/apps/[appId]/scheduled-jobs/index.tsx
@@ -0,0 +1,321 @@
+import floConsoleService from '@app/api';
+import DeleteConfirmationDialog from '@app/components/DeleteConfirmationDialog';
+import { EmptyStateCard } from '@app/components/EmptyCard';
+import { Badge } from '@app/components/ui/badge';
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbList,
+  BreadcrumbSeparator,
+} from '@app/components/ui/breadcrumb';
+import { Button } from '@app/components/ui/button';
+import { Input } from '@app/components/ui/input';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@app/components/ui/table';
+import { useGetAllDatasources, useGetAppUsers, useGetScheduledJobs } from '@app/hooks';
+import { getScheduledJobsKey } from '@app/hooks/data/query-keys';
+import { cn } from '@app/lib/utils';
+import { useDashboardStore, useNotifyStore } from '@app/store';
+import { ScheduledJob } from '@app/types/scheduled-job';
+import { useQueryClient } from '@tanstack/react-query';
+import { useMemo, useState } from 'react';
+import { useNavigate, useParams } from 'react-router';
+import ScheduledJobFormDialog from './ScheduledJobFormDialog';
+import {
+  extractRecipientUserIdsFromPayload,
+  formatDateTime,
+  formatJobQueriesLabel,
+  getDatasourceIdFromPayload,
+  resolveUsersFromRecipientIds,
+} from './scheduled-job-utils';
+
+const statusBadgeClass: Record<string, string> = {
+  active: 'bg-green-100 text-green-800',
+  paused: 'bg-yellow-100 text-yellow-800',
+  running: 'bg-blue-100 text-blue-800',
+  failed: 'bg-red-100 text-red-800',
+  completed: 'bg-gray-100 text-gray-800',
+};
+
+const ScheduledJobsPage: React.FC = () => {
+  const { app: appId } = useParams<{ app: string }>();
+  const navigate = useNavigate();
+  const queryClient = useQueryClient();
+  const { selectedApp } = useDashboardStore();
+  const { notifySuccess, notifyError } = useNotifyStore();
+
+  const [searchTerm, setSearchTerm] = useState('');
+  const [statusFilter, setStatusFilter] = useState<string>('all');
+  const [formOpen, setFormOpen] = useState(false);
+  const [editingJob, setEditingJob] = useState<ScheduledJob | null>(null);
+  const [deleteJob, setDeleteJob] = useState<ScheduledJob | null>(null);
+  const [deleting, setDeleting] = useState(false);
+  const [actionJobId, setActionJobId] = useState<string | null>(null);
+
+  const { data: jobs = [], isLoading } = useGetScheduledJobs(appId);
+  const { data: datasources = [] } = useGetAllDatasources(appId);
+  const { data: appUsers = [] } = useGetAppUsers(appId);
+
+  const datasourceNameById = useMemo(() => {
+    const map = new Map<string, string>();
+    for (const ds of datasources) {
+      map.set(ds.id, ds.name || ds.id);
+    }
+    return map;
+  }, [datasources]);
+
+  const filteredJobs = useMemo(() => {
+    const term = searchTerm.trim().toLowerCase();
+    return jobs.filter((job) => {
+      if (statusFilter !== 'all' && job.status !== statusFilter) return false;
+      if (!term) return true;
+      const payload = job.payload || {};
+      const datasourceId = getDatasourceIdFromPayload(payload);
+      const datasourceName = datasourceNameById.get(datasourceId) || datasourceId;
+      const queriesLabel = formatJobQueriesLabel(job).toLowerCase();
+      const subject = String(payload.subject || '').toLowerCase();
+      return (
+        job.cron_expr.toLowerCase().includes(term) ||
+        job.timezone.toLowerCase().includes(term) ||
+        job.status.toLowerCase().includes(term) ||
+        datasourceName.toLowerCase().includes(term) ||
+        datasourceId.toLowerCase().includes(term) ||
+        queriesLabel.includes(term) ||
+        subject.includes(term)
+      );
+    });
+  }, [jobs, searchTerm, statusFilter, datasourceNameById]);
+
+  const refreshJobs = () => {
+    queryClient.invalidateQueries({ queryKey: getScheduledJobsKey(appId || '') });
+  };
+
+  const handleCreate = () => {
+    setEditingJob(null);
+    setFormOpen(true);
+  };
+
+  const handleEdit = (job: ScheduledJob) => {
+    setEditingJob(job);
+    setFormOpen(true);
+  };
+
+  const handlePauseResume = async (job: ScheduledJob) => {
+    setActionJobId(job.id);
+    try {
+      if (job.status === 'paused') {
+        await floConsoleService.scheduledJobService.resumeScheduledJob(job.id);
+        notifySuccess('Scheduled job resumed');
+      } else {
+        await floConsoleService.scheduledJobService.pauseScheduledJob(job.id);
+        notifySuccess('Scheduled job paused');
+      }
+      refreshJobs();
+    } catch {
+      notifyError('Failed to update job status');
+    } finally {
+      setActionJobId(null);
+    }
+  };
+
+  const handleDeleteConfirm = async () => {
+    if (!deleteJob) return;
+    setDeleting(true);
+    try {
+      await floConsoleService.scheduledJobService.deleteScheduledJob(deleteJob.id);
+      notifySuccess('Scheduled job deleted');
+      setDeleteJob(null);
+      refreshJobs();
+    } catch {
+      notifyError('Failed to delete scheduled job');
+    } finally {
+      setDeleting(false);
+    }
+  };
+
+  const getRecipientSummary = (job: ScheduledJob) => {
+    const ids = extractRecipientUserIdsFromPayload(job.payload || {});
+    const users = resolveUsersFromRecipientIds(ids, appUsers);
+    if (users.length === 0) return `${ids.length} recipient(s)`;
+    if (users.length <= 2) {
+      return users.map((u) => u.email).join(', ');
+    }
+    return `${users.length} recipients`;
+  };
+
+  return (
+    <div className="flex h-full w-full flex-col p-8">
+      <Breadcrumb className="mb-4">
+        <BreadcrumbList>
+          <BreadcrumbItem>
+            <BreadcrumbLink asChild>
+              <button type="button" onClick={() => navigate('/apps')} className="hover:text-foreground cursor-pointer">
+                Apps
+              </button>
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+          <BreadcrumbSeparator />
+          <BreadcrumbItem>
+            <BreadcrumbLink asChild>
+              <button
+                type="button"
+                onClick={() => navigate(`/apps/${appId}/scheduled-jobs`)}
+                className="hover:text-foreground cursor-pointer"
+              >
+                Scheduled Jobs
+              </button>
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+        </BreadcrumbList>
+      </Breadcrumb>
+
+      <div className="mb-8 flex w-full items-start justify-between">
+        <div>
+          <h1 className="text-3xl font-bold text-gray-900">Scheduled Jobs</h1>
+          <p className="mt-2 text-gray-600">Manage email report schedules for {selectedApp?.app_name}</p>
+        </div>
+        <div className="flex items-center gap-3">
+          <Input
+            className="w-[200px]"
+            type="text"
+            placeholder="Search"
+            value={searchTerm}
+            onChange={(e) => setSearchTerm(e.target.value)}
+          />
+          <Select value={statusFilter} onValueChange={setStatusFilter}>
+            <SelectTrigger className="w-[140px]">
+              <SelectValue placeholder="Status" />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="all">All statuses</SelectItem>
+              <SelectItem value="active">Active</SelectItem>
+              <SelectItem value="paused">Paused</SelectItem>
+              <SelectItem value="running">Running</SelectItem>
+              <SelectItem value="failed">Failed</SelectItem>
+              <SelectItem value="completed">Completed</SelectItem>
+            </SelectContent>
+          </Select>
+          <Button onClick={handleCreate}>Create Schedule</Button>
+        </div>
+      </div>
+
+      {isLoading ? (
+        <p className="text-sm text-gray-500">Loading scheduled jobs...</p>
+      ) : filteredJobs.length === 0 ? (
+        <div className="mt-10 flex justify-center">
+          <EmptyStateCard
+            title="No scheduled jobs"
+            description="Create a schedule to email dynamic query reports on a cron"
+            actionText="Create Schedule"
+            onActionClick={handleCreate}
+          />
+        </div>
+      ) : (
+        <div className="overflow-hidden rounded-lg border border-[#EFF0F1]">
+          <Table>
+            <TableHeader>
+              <TableRow>
+                <TableHead>Status</TableHead>
+                <TableHead>Datasource</TableHead>
+                <TableHead>Queries</TableHead>
+                <TableHead>Cron</TableHead>
+                <TableHead>Recipients</TableHead>
+                <TableHead>Next run</TableHead>
+                <TableHead>Last run</TableHead>
+                <TableHead className="text-right">Actions</TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {filteredJobs.map((job) => {
+                const payload = job.payload || {};
+                const datasourceId = getDatasourceIdFromPayload(payload);
+                const canPauseResume = job.status === 'active' || job.status === 'paused';
+                return (
+                  <TableRow key={job.id}>
+                    <TableCell>
+                      <Badge
+                        variant="secondary"
+                        className={cn('font-normal capitalize', statusBadgeClass[job.status] || '')}
+                      >
+                        {job.status}
+                      </Badge>
+                    </TableCell>
+                    <TableCell className="max-w-[160px] truncate" title={datasourceId}>
+                      {datasourceNameById.get(datasourceId) || datasourceId || '—'}
+                    </TableCell>
+                    <TableCell className="max-w-[200px] truncate" title={formatJobQueriesLabel(job)}>
+                      {formatJobQueriesLabel(job)}
+                    </TableCell>
+                    <TableCell className="text-sm whitespace-nowrap">
+                      <span className="font-mono text-xs">{job.cron_expr}</span>
+                      <span className="mt-0.5 block text-[#878787]">{job.timezone}</span>
+                    </TableCell>
+                    <TableCell className="max-w-[180px] truncate text-sm" title={getRecipientSummary(job)}>
+                      {getRecipientSummary(job)}
+                    </TableCell>
+                    <TableCell className="text-sm whitespace-nowrap">{formatDateTime(job.next_run_at)}</TableCell>
+                    <TableCell className="text-sm whitespace-nowrap">{formatDateTime(job.last_run_at)}</TableCell>
+                    <TableCell className="text-right">
+                      <div className="flex justify-end gap-2">
+                        {canPauseResume ? (
+                          <Button
+                            variant="outline"
+                            size="sm"
+                            disabled={actionJobId === job.id}
+                            onClick={() => void handlePauseResume(job)}
+                          >
+                            {job.status === 'paused' ? 'Resume' : 'Pause'}
+                          </Button>
+                        ) : null}
+                        <Button variant="outline" size="sm" onClick={() => handleEdit(job)}>
+                          Edit
+                        </Button>
+                        <Button variant="destructive" size="sm" onClick={() => setDeleteJob(job)}>
+                          Delete
+                        </Button>
+                      </div>
+                      {job.last_error ? (
+                        <p className="mt-1 max-w-[240px] truncate text-xs text-red-500" title={job.last_error}>
+                          {job.last_error}
+                        </p>
+                      ) : null}
+                    </TableCell>
+                  </TableRow>
+                );
+              })}
+            </TableBody>
+          </Table>
+        </div>
+      )}
+
+      {appId ? (
+        <ScheduledJobFormDialog
+          isOpen={formOpen}
+          appId={appId}
+          job={editingJob}
+          onOpenChange={(open) => {
+            setFormOpen(open);
+            if (!open) setEditingJob(null);
+          }}
+          onSuccess={refreshJobs}
+        />
+      ) : null}
+
+      {deleteJob ? (
+        <DeleteConfirmationDialog
+          isOpen={Boolean(deleteJob)}
+          title="Delete scheduled job"
+          message="Are you sure you want to delete this schedule? This action cannot be undone."
+          onConfirm={handleDeleteConfirm}
+          onCancel={() => setDeleteJob(null)}
+          loading={deleting}
+          confirmLabel="Delete"
+          cancelLabel="Cancel"
+        />
+      ) : null}
+    </div>
+  );
+};
+
+export default ScheduledJobsPage;
diff --git a/wavefront/client/src/pages/apps/[appId]/scheduled-jobs/scheduled-job-utils.ts b/wavefront/client/src/pages/apps/[appId]/scheduled-jobs/scheduled-job-utils.ts
new file mode 100644
index 00000000..13d9a01e
--- /dev/null
+++ b/wavefront/client/src/pages/apps/[appId]/scheduled-jobs/scheduled-job-utils.ts
@@ -0,0 +1,92 @@
+import { ScheduledJob, ScheduledJobEmailPayload } from '@app/types/scheduled-job';
+import { IUser } from '@app/types/user';
+
+export const normalizeUserId = (id: string) => id.trim().toLowerCase();
+
+export const formatUserLabel = (user: IUser) => `${user.first_name} ${user.last_name} (${user.email})`;
+
+export const extractRecipientUserIdsFromPayload = (payload: Record<string, unknown>): string[] => {
+  const rawIds = payload.recipient_user_ids;
+  const ids: string[] = [];
+  if (Array.isArray(rawIds)) {
+    for (const item of rawIds) {
+      const id = String(item).trim();
+      if (id) ids.push(id);
+    }
+  } else if (typeof rawIds === 'string' && rawIds.trim()) {
+    ids.push(rawIds.trim());
+  }
+  return ids;
+};
+
+export const resolveUsersFromRecipientIds = (ids: string[], users: IUser[]): IUser[] => {
+  const resolved: IUser[] = [];
+  const seen = new Set<string>();
+  for (const id of ids) {
+    const user = users.find((u) => normalizeUserId(u.id) === normalizeUserId(id));
+    if (user && !seen.has(normalizeUserId(user.id))) {
+      seen.add(normalizeUserId(user.id));
+      resolved.push(user);
+    }
+  }
+  return resolved;
+};
+
+export const getQueryIdsFromPayload = (payload: Record<string, unknown>): string[] => {
+  const queries = payload.queries;
+  if (!Array.isArray(queries)) return [];
+
+  const ids: string[] = [];
+  for (const item of queries) {
+    if (item && typeof item === 'object' && 'query_id' in item) {
+      const queryId = String((item as { query_id: unknown }).query_id).trim();
+      if (queryId) ids.push(queryId);
+    }
+  }
+  return ids;
+};
+
+export const getDatasourceIdFromPayload = (payload: Record<string, unknown>): string => {
+  if (typeof payload.datasource_id === 'string' && payload.datasource_id.trim()) {
+    return payload.datasource_id.trim();
+  }
+  return '';
+};
+
+export const buildEmailPayload = (args: {
+  datasourceId: string;
+  queryIds: string[];
+  recipientUserIds: string[];
+  subject?: string;
+  emailContent?: string;
+  columnStyles?: ScheduledJobEmailPayload['column_styles'];
+  dateRange?: ScheduledJobEmailPayload['date_range'];
+  startDateParam?: string;
+  endDateParam?: string;
+  params?: Record<string, unknown>;
+}): ScheduledJobEmailPayload => ({
+  datasource_id: args.datasourceId,
+  queries: args.queryIds.map((query_id) => ({ query_id })),
+  recipient_user_ids: args.recipientUserIds,
+  subject: args.subject,
+  email_content: args.emailContent,
+  column_styles: args.columnStyles,
+  date_range: args.dateRange,
+  start_date_param: args.startDateParam,
+  end_date_param: args.endDateParam,
+  params: args.params,
+});
+
+export const formatJobQueriesLabel = (job: ScheduledJob): string => {
+  const ids = getQueryIdsFromPayload(job.payload || {});
+  if (ids.length === 0) return '—';
+  if (ids.length <= 2) return ids.join(', ');
+  return `${ids.slice(0, 2).join(', ')} +${ids.length - 2} more`;
+};
+
+export const formatDateTime = (value: string | null): string => {
+  if (!value) return '—';
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return value;
+  return date.toLocaleString();
+};
diff --git a/wavefront/client/src/pages/apps/[appId]/workflows/index.tsx b/wavefront/client/src/pages/apps/[appId]/workflows/index.tsx
index 23558d2f..8a6b4974 100644
--- a/wavefront/client/src/pages/apps/[appId]/workflows/index.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/workflows/index.tsx
@@ -80,7 +80,7 @@ const WorkflowManagement: React.FC = () => {
   };
 
   return (
-    <div className="h-full w-full overflow-hidden">
+    <div className="w-full pb-8">
       <div className="mb-8 flex items-center justify-end">
         <div className="flex items-center gap-4">
           <Select value={namespace || undefined} onValueChange={(value) => handleNamespaceChange(value || '')}>
diff --git a/wavefront/client/src/pages/apps/[appId]/workflows/layout.tsx b/wavefront/client/src/pages/apps/[appId]/workflows/layout.tsx
index b157712c..e294667c 100644
--- a/wavefront/client/src/pages/apps/[appId]/workflows/layout.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/workflows/layout.tsx
@@ -36,8 +36,8 @@ const WorkflowsLayout: React.FC = () => {
   };
 
   return (
-    <div className="flex h-full w-full flex-col bg-white">
-      <div className="flex h-full w-full flex-col">
+    <div className="flex h-full min-h-0 w-full flex-col bg-white">
+      <div className="flex min-h-0 flex-1 flex-col">
         {/* Breadcrumb */}
         <div className="px-8 pt-8">
           <Breadcrumb className="mb-4">
@@ -86,7 +86,7 @@ const WorkflowsLayout: React.FC = () => {
         </div>
 
         {/* Child Route Content */}
-        <div className="flex-1 overflow-auto px-8">
+        <div className="min-h-0 flex-1 overflow-y-auto px-8">
           <Outlet />
         </div>
       </div>
diff --git a/wavefront/client/src/pages/apps/[appId]/workflows/pipelines/index.tsx b/wavefront/client/src/pages/apps/[appId]/workflows/pipelines/index.tsx
index d25306d6..5588ce55 100644
--- a/wavefront/client/src/pages/apps/[appId]/workflows/pipelines/index.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/workflows/pipelines/index.tsx
@@ -85,7 +85,7 @@ const WorkflowPipelinesPage: React.FC = () => {
   };
 
   return (
-    <div className="h-full w-full overflow-hidden">
+    <div className="w-full pb-8">
       <div className="mb-8 flex items-center justify-end">
         <div className="flex items-center gap-4">
           <Select value={workflow || undefined} onValueChange={(value) => handleWorkflowChange(value || '')}>
diff --git a/wavefront/client/src/pages/apps/layout.tsx b/wavefront/client/src/pages/apps/layout.tsx
index 323402fa..f05d801c 100644
--- a/wavefront/client/src/pages/apps/layout.tsx
+++ b/wavefront/client/src/pages/apps/layout.tsx
@@ -6,6 +6,7 @@ import {
   ModelRepositoryIcon,
   PhoneIcon,
   RagIcon,
+  ScheduledJobsIcon,
   WorkflowIcon,
 } from '@app/assets/icons';
 import { appEnv } from '@app/config/env';
@@ -34,6 +35,13 @@ const navItems = [
     link: `/apps/:appId/datasources`,
     description: 'Manage and configure data sources for this application',
   },
+  {
+    id: 'scheduled-jobs',
+    name: 'Scheduled Jobs',
+    icon: ScheduledJobsIcon,
+    link: `/apps/:appId/scheduled-jobs`,
+    description: 'Schedule dynamic query reports to be emailed automatically',
+  },
   {
     id: 'functions',
     name: 'Functions',
@@ -104,7 +112,7 @@ const AppLayout: React.FC = () => {
 
   return (
     <div className="h-full bg-white">
-      <div className="flex h-full w-full overflow-auto">
+      <div className="flex h-full min-h-0 w-full">
         <div className="flex h-full w-[240px] flex-col gap-3 border-r border-gray-200 p-5">
           {finalNavItems.map((item) => {
             const isActive = item.id === location.pathname.split('/')[3];
@@ -141,7 +149,7 @@ const AppLayout: React.FC = () => {
             );
           })}
         </div>
-        <div className="flex-1 overflow-auto">
+        <div className="min-h-0 flex-1 overflow-y-auto">
           <Outlet />
         </div>
       </div>
diff --git a/wavefront/client/src/pages/apps/users/index.tsx b/wavefront/client/src/pages/apps/users/index.tsx
index baa66362..be5a8d15 100644
--- a/wavefront/client/src/pages/apps/users/index.tsx
+++ b/wavefront/client/src/pages/apps/users/index.tsx
@@ -4,8 +4,8 @@ import { EmptyStateCard } from '@app/components/EmptyCard';
 import { Button } from '@app/components/ui/button';
 import { Input } from '@app/components/ui/input';
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@app/components/ui/table';
-import { useGetCurrentUser, useGetUsers } from '@app/hooks';
-import { getUsersKey } from '@app/hooks/data/query-keys';
+import { useGetConsoleUsers, useGetCurrentUser } from '@app/hooks';
+import { getConsoleUsersKey } from '@app/hooks/data/query-keys';
 import { extractErrorMessage } from '@app/lib/utils';
 import { useNotifyStore } from '@app/store';
 import { IUser } from '@app/types/user';
@@ -27,8 +27,8 @@ const UsersPage: React.FC = () => {
   const [editItem, setEditItem] = useState<IUser | null>(null);
   const [manageAppAccessItem, setManageAppAccessItem] = useState<IUser | null>(null);
 
-  // Fetch users and current user
-  const { data: users = [], isLoading: usersLoading } = useGetUsers();
+  // Fetch console users and current user
+  const { data: consoleUsers = [], isLoading: consoleUsersLoading } = useGetConsoleUsers();
   const { data: currentUser } = useGetCurrentUser(true);
 
   // Check if current user is owner
@@ -65,7 +65,7 @@ const UsersPage: React.FC = () => {
   };
 
   const handleEditSuccess = () => {
-    queryClient.invalidateQueries({ queryKey: getUsersKey() });
+    queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
     setEditItem(null);
   };
 
@@ -76,7 +76,7 @@ const UsersPage: React.FC = () => {
     try {
       await floConsoleService.userService.deleteUser(deleteItem.id);
       notifySuccess('User deleted successfully');
-      queryClient.invalidateQueries({ queryKey: getUsersKey() });
+      queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
       setDeleteItem(null);
     } catch (error) {
       const errorMessage = extractErrorMessage(error);
@@ -95,11 +95,11 @@ const UsersPage: React.FC = () => {
   };
 
   const handleCreateSuccess = () => {
-    queryClient.invalidateQueries({ queryKey: getUsersKey() });
+    queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
     setCreateDialogOpen(false);
   };
 
-  const filteredUsers = users.filter((user) => {
+  const filteredUsers = consoleUsers.filter((user) => {
     const query = searchQuery.toLowerCase();
     return (
       user.email.toLowerCase().includes(query) ||
@@ -131,7 +131,7 @@ const UsersPage: React.FC = () => {
         </div>
       </div>
 
-      {usersLoading ? (
+      {consoleUsersLoading ? (
         <div className="flex justify-center py-10">
           <div className="text-gray-500">Loading users...</div>
         </div>
diff --git a/wavefront/client/src/router/routes.tsx b/wavefront/client/src/router/routes.tsx
index 9608a3b2..66f9a0ef 100644
--- a/wavefront/client/src/router/routes.tsx
+++ b/wavefront/client/src/router/routes.tsx
@@ -7,6 +7,7 @@ import AuthenticatorsPage from '@app/pages/apps/[appId]/authenticators';
 import AuthenticatorDetailPage from '@app/pages/apps/[appId]/authenticators/[authId]';
 import DatasourcesManagement from '@app/pages/apps/[appId]/datasources';
 import DatasourceDetail from '@app/pages/apps/[appId]/datasources/[datasourceId]';
+import ScheduledJobsPage from '@app/pages/apps/[appId]/scheduled-jobs';
 import FunctionsManagement from '@app/pages/apps/[appId]/functions';
 import FunctionDetail from '@app/pages/apps/[appId]/functions/[functionId]';
 import KnowledgeBaseDetailPage from '@app/pages/apps/[appId]/knowledge-bases/[kbId]';
@@ -99,6 +100,10 @@ const routes = {
           path: 'datasources/:datasourceId',
           element: <DatasourceDetail />,
         },
+        {
+          path: 'scheduled-jobs',
+          element: <ScheduledJobsPage />,
+        },
         {
           path: 'model-inference',
           element: <ModelManagement />,
diff --git a/wavefront/client/src/types/scheduled-job.ts b/wavefront/client/src/types/scheduled-job.ts
index 93bac536..33df8186 100644
--- a/wavefront/client/src/types/scheduled-job.ts
+++ b/wavefront/client/src/types/scheduled-job.ts
@@ -1,5 +1,20 @@
 import { IApiResponse } from '@app/lib/axios';
 
+export interface ColumnStyleRule {
+  op: 'eq' | 'neq' | 'lt' | 'lte' | 'gt' | 'gte' | 'between';
+  fill: string;
+  value?: number;
+  min?: number;
+  max?: number;
+  min_inclusive?: boolean;
+  max_inclusive?: boolean;
+}
+
+export interface ColumnStyleConfig {
+  column: string;
+  rules: ColumnStyleRule[];
+}
+
 export interface ScheduledJob {
   id: string;
   job_type: string;
@@ -24,23 +39,51 @@ export interface ScheduledJobListResponseData {
   jobs: ScheduledJob[];
 }
 
+/** Per-query overrides; job payload requires a non-empty queries array. */
+export interface ScheduledJobQuerySpec {
+  query_id: string;
+  datasource_id?: string;
+  filter?: string;
+  offset?: number;
+  limit?: number;
+  params?: Record<string, unknown>;
+  column_styles?: ColumnStyleConfig[];
+  date_range?: 'last_day' | 't_2' | 'last_hour' | 'last_7_days' | 'last_30_days';
+  start_date_param?: string;
+  end_date_param?: string;
+}
+
+export interface ScheduledJobEmailPayload {
+  datasource_id: string;
+  queries: ScheduledJobQuerySpec[];
+  recipient_user_ids: string[];
+  subject?: string;
+  email_content?: string;
+  column_styles?: ColumnStyleConfig[];
+  date_range?: 'last_day' | 't_2' | 'last_hour' | 'last_7_days' | 'last_30_days';
+  start_date_param?: string;
+  end_date_param?: string;
+  offset?: number;
+  limit?: number;
+  params?: Record<string, unknown>;
+}
+
 export interface CreateScheduledJobRequest {
   job_type: 'email_dynamic_query';
   cron_expr: string;
   timezone: string;
   max_retries: number;
-  payload: {
-    datasource_id: string;
-    query_id: string;
-    recipients: string[];
-    subject?: string;
-    date_range?: 'last_day' | 'last_hour' | 'last_7_days' | 'last_30_days';
-    start_date_param?: string;
-    end_date_param?: string;
-    offset?: number;
-    limit?: number;
-    params?: Record<string, unknown>;
-  };
+  payload: ScheduledJobEmailPayload;
+}
+
+export type JobStatus = 'active' | 'paused' | 'running' | 'failed' | 'completed';
+
+export interface UpdateScheduledJobRequest {
+  cron_expr?: string;
+  timezone?: string;
+  payload?: ScheduledJobEmailPayload;
+  max_retries?: number;
+  status?: JobStatus;
 }
 
 export type CreateScheduledJobResponse = IApiResponse<ScheduledJobResponseData>;
diff --git a/wavefront/server/apps/floware/floware/config.ini b/wavefront/server/apps/floware/floware/config.ini
index 82e35721..10f3d32d 100644
--- a/wavefront/server/apps/floware/floware/config.ini
+++ b/wavefront/server/apps/floware/floware/config.ini
@@ -127,9 +127,10 @@ authority=${AUTHORITY}
 webhook_url=${WEBHOOK_URL}
 
 [gmail]
-service_account_file=${GMAIL_SERVICE_ACCOUNT_FILE}
+client_id=${GMAIL_CLIENT_ID}
+client_secret=${GMAIL_CLIENT_SECRET}
+refresh_token=${GMAIL_REFRESH_TOKEN}
 email_sender=${GMAIL_SENDER_EMAILID}
-delegate_user=${GMAIL_DELEGATE_USER}
 
 [scheduler]
 daily_alert_cron=${DAILY_ALERT_CRON:0 5 * * *}
diff --git a/wavefront/server/apps/floware/floware/controllers/scheduled_job_controller.py b/wavefront/server/apps/floware/floware/controllers/scheduled_job_controller.py
index 3fe2f68f..2b10e45a 100644
--- a/wavefront/server/apps/floware/floware/controllers/scheduled_job_controller.py
+++ b/wavefront/server/apps/floware/floware/controllers/scheduled_job_controller.py
@@ -69,6 +69,7 @@ async def create_scheduled_job(
 async def list_scheduled_jobs(
     request: Request,
     limit: int = 100,
+    offset: int = 0,
     job_type: str | None = None,
     job_status: str | None = None,
     query_id: str | None = None,
@@ -93,6 +94,7 @@ async def list_scheduled_jobs(
 
     jobs = await scheduled_job_service.list_jobs(
         limit=limit,
+        offset=offset,
         job_type=job_type,
         status=job_status,
         payload_filters=payload_filters or None,
diff --git a/wavefront/server/apps/floware/floware/di/application_container.py b/wavefront/server/apps/floware/floware/di/application_container.py
index 60d2232c..b764703c 100644
--- a/wavefront/server/apps/floware/floware/di/application_container.py
+++ b/wavefront/server/apps/floware/floware/di/application_container.py
@@ -25,6 +25,9 @@ class ApplicationContainer(containers.DeclarativeContainer):
     datasource_repository = providers.Dependency()
     dynamic_query_repository = providers.Dependency()
     email_service = providers.Dependency()
+    user_service = providers.Dependency()
+    role_repository = providers.Dependency()
+    user_role_repository = providers.Dependency()
 
     # services
     notification_service = providers.Singleton(
@@ -48,4 +51,8 @@ class ApplicationContainer(containers.DeclarativeContainer):
         cloud_storage_manager=cloud_storage_manager,
         bucket_name=config.floware.asset_storage_bucket,
         email_service=email_service,
+        user_repository=user_repository,
+        user_service=user_service,
+        role_repository=role_repository,
+        user_role_repository=user_role_repository,
     )
diff --git a/wavefront/server/apps/floware/floware/server.py b/wavefront/server/apps/floware/floware/server.py
index 9f99134f..2441a463 100644
--- a/wavefront/server/apps/floware/floware/server.py
+++ b/wavefront/server/apps/floware/floware/server.py
@@ -132,6 +132,9 @@
     datasource_repository=db_repo_container.datasource_repository,
     dynamic_query_repository=db_repo_container.dynamic_query_repository,
     email_service=user_module_container.email_service,
+    user_service=user_module_container.user_service,
+    role_repository=user_module_container.role_repository,
+    user_role_repository=user_module_container.user_role_repository,
 )
 
 email_rag_container = KnowledgeBaseContainer(
diff --git a/wavefront/server/apps/floware/floware/services/scheduled_job_service.py b/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
index 45879eb5..a1449016 100644
--- a/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
+++ b/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
@@ -1,31 +1,57 @@
-import csv
+import hashlib
+import html
 import io
 import json
 import os
+import re
 from datetime import datetime, timedelta, timezone
+from decimal import Decimal
 from zoneinfo import ZoneInfo
 
 from apscheduler.triggers.cron import CronTrigger
 from common_module.log.logger import logger
 from common_module.utils.serializer import serialize_values
 from datasource import DatasourcePlugin
+from openpyxl import Workbook
+from openpyxl.styles import Font, PatternFill
 from db_repo_module.database.connection import DatabaseClient
 from db_repo_module.models.datasource import Datasource
 from db_repo_module.models.dynamic_query_yaml import DynamicQueryYaml
+from db_repo_module.models.resource import ResourceScope
+from db_repo_module.models.role import Role
 from db_repo_module.models.scheduled_job import ScheduledJob
 from db_repo_module.models.scheduled_job_execution import ScheduledJobExecution
+from db_repo_module.models.user import User
+from db_repo_module.models.user_role import UserRole
 from db_repo_module.repositories.sql_alchemy_repository import SQLAlchemyRepository
 from plugins_module.services.dynamic_query_service import DynamicQueryService
-from plugins_module.services.datasource_services import get_datasource_config
+from plugins_module.services.datasource_services import (
+    fetch_data_filters,
+    get_datasource_config,
+)
 from sqlalchemy import select, text
 from sqlalchemy.exc import IntegrityError
+from user_management_module.constants.auth import SERVICE_AUTH_ROLE_ID
 from user_management_module.services.email_service import EmailService
+from user_management_module.services.user_service import UserService
 
 STALE_LOCK_TIMEOUT_MINUTES = 30
 SIGNED_URL_EXPIRY_SECONDS = 7 * 24 * 60 * 60
 # Gmail and many providers cap attachments; keep below typical limits.
 MAX_EMAIL_ATTACHMENT_BYTES = 10 * 1024 * 1024
 
+COLUMN_FILL_COLORS = {
+    'light_red': 'FFC7CE',
+    'light_yellow': 'FFEB9C',
+    'light_green': 'C6EFCE',
+    'dark_green': '006100',
+}
+COLUMN_FILL_FONT_COLORS = {
+    'dark_green': 'FFFFFF',
+}
+
+EMAIL_QUERY_PLACEHOLDER_PATTERN = re.compile(r'\{([a-zA-Z0-9_.\-]+)\}')
+
 
 class ScheduledJobService:
     def __init__(
@@ -38,6 +64,10 @@ def __init__(
         cloud_storage_manager,
         bucket_name: str,
         email_service: EmailService,
+        user_repository: SQLAlchemyRepository[User],
+        user_service: UserService,
+        role_repository: SQLAlchemyRepository[Role],
+        user_role_repository: SQLAlchemyRepository[UserRole],
     ):
         self.db_client = db_client
         self.scheduled_job_repository = scheduled_job_repository
@@ -47,6 +77,10 @@ def __init__(
         self.cloud_storage_manager = cloud_storage_manager
         self.bucket_name = bucket_name
         self.email_service = email_service
+        self.user_repository = user_repository
+        self.user_service = user_service
+        self.role_repository = role_repository
+        self.user_role_repository = user_role_repository
         self.worker_id = os.getenv('HOSTNAME', 'floware-worker')
         self.dynamic_query_service = DynamicQueryService(
             cloud_storage_manager=self.cloud_storage_manager,
@@ -59,7 +93,13 @@ def _resolve_runtime_params(self, payload: dict, tz_name: str) -> dict | None:
         base_params = payload.get('params')
         params: dict = dict(base_params) if isinstance(base_params, dict) else {}
         date_range = payload.get('date_range')
-        if date_range not in {'last_day', 'last_hour', 'last_7_days', 'last_30_days'}:
+        if date_range not in {
+            'last_day',
+            't_2',
+            'last_hour',
+            'last_7_days',
+            'last_30_days',
+        }:
             return params or None
 
         start_key = payload.get('start_date_param', 'start_date')
@@ -79,6 +119,10 @@ def _resolve_runtime_params(self, payload: dict, tz_name: str) -> dict | None:
         if date_range == 'last_day':
             start_date = today - timedelta(days=1)
             end_date = today - timedelta(days=1)
+        elif date_range == 't_2':
+            # T-2: two calendar days before the run date in the job timezone.
+            start_date = today - timedelta(days=2)
+            end_date = today - timedelta(days=2)
         elif date_range == 'last_7_days':
             end_date = today - timedelta(days=1)
             start_date = end_date - timedelta(days=6)
@@ -124,6 +168,7 @@ async def create_job(
     async def list_jobs(
         self,
         limit: int = 100,
+        offset: int = 0,
         job_type: str | None = None,
         status: str | None = None,
         payload_filters: dict[str, str] | None = None,
@@ -135,9 +180,26 @@ async def list_jobs(
             query = query.where(ScheduledJob.status == status)
         if payload_filters:
             for key, value in payload_filters.items():
+                if key == 'query_id':
+                    query = query.where(
+                        text(
+                            """
+                            EXISTS (
+                                SELECT 1
+                                FROM jsonb_array_elements(
+                                    scheduled_job.payload->'queries'
+                                ) AS elem
+                                WHERE elem->>'query_id' = :query_id
+                            )
+                            """
+                        ).bindparams(query_id=value)
+                    )
+                    continue
                 # JSONB subscript + astext for case-sensitive text comparison.
                 query = query.where(ScheduledJob.payload[key].astext == value)
-        query = query.order_by(ScheduledJob.created_at.desc()).limit(limit)
+        query = (
+            query.order_by(ScheduledJob.created_at.desc()).offset(offset).limit(limit)
+        )
         async with self.db_client.session() as session:
             return (await session.scalars(query)).all()
 
@@ -350,38 +412,114 @@ def recover_stale_locks_sync(self):
 
         asyncio.run(self.recover_stale_locks())
 
-    async def _execute_email_dynamic_query_job(self, payload: dict, job_timezone: str):
-        datasource_id = payload.get('datasource_id')
-        query_id = payload.get('query_id')
-        recipients = payload.get('recipients', [])
-        subject = payload.get('subject', f'Scheduled Dynamic Query Report: {query_id}')
-        filter_expr = payload.get('filter')
-        offset = payload.get('offset', 0)
-        limit = payload.get('limit', 100)
-        params = self._resolve_runtime_params(payload, job_timezone)
+    @staticmethod
+    def _normalize_query_specs(payload: dict) -> list[dict]:
+        queries = payload.get('queries')
+        if not isinstance(queries, list) or not queries:
+            raise ValueError('payload must include a non-empty queries array')
 
-        if isinstance(recipients, str):
-            recipients = [recipients]
+        specs: list[dict] = []
+        seen_query_ids: set[str] = set()
+        for index, item in enumerate(queries):
+            if not isinstance(item, dict):
+                raise ValueError(f'payload.queries[{index}] must be an object')
+            query_id = item.get('query_id')
+            if not query_id or not str(query_id).strip():
+                raise ValueError(
+                    f'payload.queries[{index}] must include a non-empty query_id'
+                )
+            normalized_query_id = str(query_id).strip()
+            if normalized_query_id in seen_query_ids:
+                raise ValueError(
+                    f'payload.queries[{index}] duplicates query_id '
+                    f'{normalized_query_id!r}'
+                )
+            seen_query_ids.add(normalized_query_id)
+            specs.append(item)
+        return specs
 
-        if not datasource_id or not query_id or not recipients:
-            raise ValueError('payload must include datasource_id, query_id, recipients')
+    @classmethod
+    def _merge_query_spec(cls, job_payload: dict, query_spec: dict) -> dict:
+        """Merge per-query overrides with job-level defaults."""
+        job_params = job_payload.get('params')
+        query_params = query_spec.get('params')
+        merged_params: dict | None = None
+        if isinstance(job_params, dict) or isinstance(query_params, dict):
+            merged_params = {}
+            if isinstance(job_params, dict):
+                merged_params.update(job_params)
+            if isinstance(query_params, dict):
+                merged_params.update(query_params)
 
-        datasource_type, datasource_config = await get_datasource_config(
-            datasource_id=datasource_id,
-            datasource_repository=self.datasource_repository,
-        )
-        if not datasource_type or not datasource_config:
-            raise ValueError(f'Datasource not found: {datasource_id}')
+        return {
+            'datasource_id': query_spec.get('datasource_id')
+            or job_payload.get('datasource_id'),
+            'query_id': str(query_spec['query_id']).strip(),
+            'filter': query_spec.get('filter', job_payload.get('filter')),
+            'offset': query_spec.get('offset', job_payload.get('offset', 0)),
+            'limit': query_spec.get('limit', job_payload.get('limit', 100)),
+            'column_styles': query_spec.get(
+                'column_styles', job_payload.get('column_styles')
+            ),
+            'date_range': query_spec.get('date_range', job_payload.get('date_range')),
+            'start_date_param': query_spec.get(
+                'start_date_param', job_payload.get('start_date_param', 'start_date')
+            ),
+            'end_date_param': query_spec.get(
+                'end_date_param', job_payload.get('end_date_param', 'end_date')
+            ),
+            'params': merged_params,
+        }
+
+    @staticmethod
+    def _normalize_recipient_user_ids(payload: dict) -> list[str]:
+        recipient_user_ids = payload.get('recipient_user_ids', [])
+        if isinstance(recipient_user_ids, str):
+            recipient_user_ids = [recipient_user_ids]
+        return [
+            str(user_id).strip()
+            for user_id in recipient_user_ids
+            if str(user_id).strip()
+        ]
+
+    async def _role_is_admin(self, role_id: str) -> bool:
+        if role_id == SERVICE_AUTH_ROLE_ID:
+            return True
+        role = await self.role_repository.find_one(id=role_id)
+        return bool(role and role.name == 'admin')
 
-        yaml_query, yaml_name = await self.dynamic_query_service.get_dynamic_yaml_query(
-            query_id
+    async def _user_is_admin(self, user_id: str) -> bool:
+        user_roles = await self.user_role_repository.find(user_id=user_id, limit=100)
+        for user_role in user_roles:
+            if await self._role_is_admin(str(user_role.role_id)):
+                return True
+        return False
+
+    async def _rls_filter_for_user(self, user_id: str) -> str | None:
+        if await self._user_is_admin(user_id):
+            return None
+        rls_filters = await self.user_service.get_user_resources(
+            user_id=user_id, scope=ResourceScope.DATA
         )
-        if not yaml_query:
-            raise ValueError(f'Dynamic query not found: {query_id}')
-        datasource_plugin = DatasourcePlugin(datasource_type, datasource_config)
+        if len(rls_filters) == 0:
+            raise ValueError(f'Data access not set for non-admin user {user_id}')
+        additional_filters = fetch_data_filters(rls_filters)
+        return f"{' $and '.join(additional_filters)}"
+
+    async def _fetch_dynamic_query_rows(
+        self,
+        datasource_plugin: DatasourcePlugin,
+        yaml_query: list,
+        query_id: str,
+        rls_filter_str: str | None,
+        filter_expr: str | None,
+        offset: int,
+        limit: int,
+        params: dict | None,
+    ) -> list[dict]:
         result = await datasource_plugin.execute_dynamic_query(
             yaml_query,
-            None,
+            rls_filter_str,
             filter_expr,
             offset,
             limit,
@@ -393,144 +531,720 @@ async def _execute_email_dynamic_query_job(self, payload: dict, job_timezone: st
         first_key = next(iter(result))
         if result[first_key].get('status') != 'success':
             raise ValueError(
-                f'Unexpected dynamic query result format for query_id {query_id}, no successful results'
+                f'Unexpected dynamic query result format for query_id {query_id}, '
+                'no successful results'
             )
-
         rows = result[first_key].get('result') or []
         if not isinstance(rows, list):
             raise ValueError(
                 f'Unexpected dynamic query result format for query_id {query_id}, invalid rows'
             )
+        return rows
 
-        if len(rows) == 0:
-            start_key = str(payload.get('start_date_param', 'start_date'))
-            end_key = str(payload.get('end_date_param', 'end_date'))
-            applied_start = params.get(start_key) if isinstance(params, dict) else None
-            applied_end = params.get(end_key) if isinstance(params, dict) else None
-            logger.info(
-                f'No records in scheduled window for query_id={query_id}; '
-                f'applying range {applied_start}..{applied_end} (keys: {start_key}, {end_key}). '
-                'Skipping email.'
-            )
-            return
+    @staticmethod
+    def _sanitize_filename_part(value: str) -> str:
+        return ''.join(
+            ch if ch.isalnum() or ch in '-_' else '_' for ch in value.strip()
+        )
+
+    @classmethod
+    def _build_report_filename(
+        cls,
+        *,
+        query_id: str,
+        user_id: str,
+        run_timestamp: str,
+        params: dict | None,
+        payload: dict,
+    ) -> str:
+        unique_hash = hashlib.sha256(f'{user_id}:{run_timestamp}'.encode()).hexdigest()[
+            :12
+        ]
+        start_key = str(payload.get('start_date_param', 'start_date'))
+        end_key = str(payload.get('end_date_param', 'end_date'))
+        start_date = params.get(start_key) if isinstance(params, dict) else None
+        end_date = params.get(end_key) if isinstance(params, dict) else None
+
+        if start_date and end_date:
+            start_part = cls._sanitize_filename_part(str(start_date))
+            end_part = cls._sanitize_filename_part(str(end_date))
+            return f'{query_id}_{start_part}_{end_part}_{unique_hash}_report.xlsx'
+        return f'{query_id}_{unique_hash}_report.xlsx'
+
+    @staticmethod
+    def _parse_numeric_cell_value(value) -> float | None:
+        if value is None or value == '':
+            return None
+        if isinstance(value, bool):
+            return float(value)
+        if isinstance(value, (int, float, Decimal)):
+            return float(value)
+        if isinstance(value, str):
+            stripped = value.strip().replace(',', '')
+            if not stripped:
+                return None
+            try:
+                return float(stripped)
+            except ValueError:
+                return None
+        return None
+
+    @staticmethod
+    def _normalize_column_key(name: str) -> str:
+        return name.strip().casefold()
+
+    @classmethod
+    def _parse_column_styles_config(cls, raw_config) -> list[dict]:
+        if not isinstance(raw_config, list):
+            return []
+
+        parsed_configs: list[dict] = []
+        supported_ops = {'eq', 'neq', 'lt', 'lte', 'gt', 'gte', 'between'}
+        for item in raw_config:
+            if not isinstance(item, dict):
+                continue
+            column = item.get('column')
+            rules = item.get('rules')
+            if not isinstance(column, str) or not column.strip():
+                continue
+            if not isinstance(rules, list):
+                continue
+
+            parsed_rules: list[dict] = []
+            for rule in rules:
+                if not isinstance(rule, dict):
+                    continue
+                op = rule.get('op')
+                fill = rule.get('fill')
+                if (
+                    op not in supported_ops
+                    or not isinstance(fill, str)
+                    or not fill.strip()
+                ):
+                    continue
+
+                parsed_rule: dict = {'op': op, 'fill': fill.strip()}
+                if op == 'between':
+                    min_value = rule.get('min')
+                    max_value = rule.get('max')
+                    if not isinstance(min_value, (int, float)) or not isinstance(
+                        max_value, (int, float)
+                    ):
+                        continue
+                    parsed_rule['min'] = float(min_value)
+                    parsed_rule['max'] = float(max_value)
+                    parsed_rule['min_inclusive'] = bool(rule.get('min_inclusive', True))
+                    parsed_rule['max_inclusive'] = bool(rule.get('max_inclusive', True))
+                else:
+                    value = rule.get('value')
+                    if not isinstance(value, (int, float)):
+                        continue
+                    parsed_rule['value'] = float(value)
+                parsed_rules.append(parsed_rule)
+
+            if parsed_rules:
+                parsed_configs.append({'column': column.strip(), 'rules': parsed_rules})
+        return parsed_configs
+
+    @staticmethod
+    def _normalize_hex_color(value: str) -> str | None:
+        if len(value) == 6 and all(ch in '0123456789ABCDEFabcdef' for ch in value):
+            return value.upper()
+        return None
 
-        if rows:
-            fieldnames = list(rows[0].keys())
-            for row in rows[1:]:
-                for k in row:
-                    if k not in fieldnames:
-                        fieldnames.append(k)
+    @classmethod
+    def _resolve_fill_styles(
+        cls, fill_name: str
+    ) -> tuple[PatternFill | None, Font | None]:
+        normalized = fill_name.strip()
+        bg_hex: str | None = None
+        font_hex: str | None = None
+
+        if normalized.startswith('#'):
+            bg_hex = cls._normalize_hex_color(normalized[1:])
+        elif normalized.casefold() in COLUMN_FILL_COLORS:
+            key = normalized.casefold()
+            bg_hex = COLUMN_FILL_COLORS[key]
+            font_hex = COLUMN_FILL_FONT_COLORS.get(key)
         else:
-            fieldnames = []
+            bg_hex = cls._normalize_hex_color(normalized)
 
-        def _cell_value(v):
-            if isinstance(v, (dict, list)):
-                return json.dumps(v)
-            return v if v is None or isinstance(v, str) else str(v)
+        if bg_hex is None:
+            return None, None
 
-        report_filename = f'{query_id}_{datetime.now(timezone.utc).strftime("%Y%m%d%H%M%S")}_report.csv'
-        buf = io.StringIO()
-        if fieldnames:
-            writer = csv.DictWriter(buf, fieldnames=fieldnames, extrasaction='ignore')
-            writer.writeheader()
-            for row in rows:
-                writer.writerow({k: _cell_value(row.get(k)) for k in fieldnames})
-        csv_bytes = buf.getvalue().encode('utf-8')
-        csv_size = len(csv_bytes)
-
-        report_url: str | None = None
-        use_attachment = csv_size <= MAX_EMAIL_ATTACHMENT_BYTES
-        if not use_attachment:
-            report_key = f'scheduled_query_reports/{query_id}/{report_filename}'
-            self.cloud_storage_manager.save_small_file(
-                file_content=csv_bytes,
-                bucket_name=self.bucket_name,
-                key=report_key,
-                content_type='text/csv',
-            )
-            report_url = self.cloud_storage_manager.generate_presigned_url(
-                bucket_name=self.bucket_name,
-                key=report_key,
-                type='GET',
-                expiresIn=SIGNED_URL_EXPIRY_SECONDS,
+        fill = PatternFill(start_color=bg_hex, end_color=bg_hex, fill_type='solid')
+        font = Font(color=font_hex) if font_hex else None
+        return fill, font
+
+    @classmethod
+    def _rule_matches(cls, rule: dict, numeric_value: float) -> bool:
+        op = rule['op']
+        if op == 'eq':
+            return numeric_value == rule['value']
+        if op == 'neq':
+            return numeric_value != rule['value']
+        if op == 'lt':
+            return numeric_value < rule['value']
+        if op == 'lte':
+            return numeric_value <= rule['value']
+        if op == 'gt':
+            return numeric_value > rule['value']
+        if op == 'gte':
+            return numeric_value >= rule['value']
+
+        min_value = rule['min']
+        max_value = rule['max']
+        if rule.get('min_inclusive', True):
+            if numeric_value < min_value:
+                return False
+        elif numeric_value <= min_value:
+            return False
+        if rule.get('max_inclusive', True):
+            if numeric_value > max_value:
+                return False
+        elif numeric_value >= max_value:
+            return False
+        return True
+
+    @classmethod
+    def _build_column_style_map(
+        cls, fieldnames: list[str], column_styles: list[dict]
+    ) -> dict[int, list[dict]]:
+        column_index = {
+            cls._normalize_column_key(name): idx for idx, name in enumerate(fieldnames)
+        }
+        style_map: dict[int, list[dict]] = {}
+        for config in column_styles:
+            col_idx = column_index.get(cls._normalize_column_key(config['column']))
+            if col_idx is None:
+                logger.warning(
+                    f'Column style config ignored; column not found: {config["column"]}'
+                )
+                continue
+            style_map[col_idx] = config['rules']
+        return style_map
+
+    @classmethod
+    def _apply_cell_style(cls, cell, raw_value, rules: list[dict]) -> None:
+        numeric_value = cls._parse_numeric_cell_value(raw_value)
+        if numeric_value is None:
+            return
+        for rule in rules:
+            if not cls._rule_matches(rule, numeric_value):
+                continue
+            fill, font = cls._resolve_fill_styles(rule['fill'])
+            if fill:
+                cell.fill = fill
+            if font:
+                cell.font = font
+            return
+
+    @staticmethod
+    def _fieldnames_from_rows(rows: list[dict]) -> list[str]:
+        if not rows:
+            return []
+        fieldnames = list(rows[0].keys())
+        for row in rows[1:]:
+            for key in row:
+                if key not in fieldnames:
+                    fieldnames.append(key)
+        return fieldnames
+
+    @classmethod
+    def _format_cell_display_value(cls, value) -> str:
+        if isinstance(value, (dict, list)):
+            return html.escape(json.dumps(value))
+        if value is None:
+            return ''
+        return html.escape(str(value))
+
+    @classmethod
+    def _css_for_cell_value(cls, raw_value, rules: list[dict] | None) -> str:
+        if not rules:
+            return ''
+        numeric_value = cls._parse_numeric_cell_value(raw_value)
+        if numeric_value is None:
+            return ''
+        for rule in rules:
+            if not cls._rule_matches(rule, numeric_value):
+                continue
+            fill, font = cls._resolve_fill_styles(rule['fill'])
+            styles: list[str] = []
+            if fill and fill.start_color:
+                rgb = getattr(fill.start_color, 'rgb', None) or getattr(
+                    fill.start_color, 'value', None
+                )
+                if rgb:
+                    hex_color = str(rgb)[-6:]
+                    styles.append(f'background-color:#{hex_color}')
+            if font and font.color:
+                rgb = getattr(font.color, 'rgb', None) or getattr(
+                    font.color, 'value', None
+                )
+                if rgb:
+                    hex_color = str(rgb)[-6:]
+                    styles.append(f'color:#{hex_color}')
+            if styles:
+                return ';'.join(styles)
+            return ''
+        return ''
+
+    @classmethod
+    def _rows_to_html_table(
+        cls,
+        rows: list[dict],
+        column_styles: list[dict] | None = None,
+    ) -> str:
+        if not rows:
+            return '<p><em>No data</em></p>'
+
+        fieldnames = cls._fieldnames_from_rows(rows)
+        style_map = cls._build_column_style_map(fieldnames, column_styles or [])
+        parts = [
+            '<table border="1" cellpadding="6" cellspacing="0" '
+            'style="border-collapse:collapse;margin:12px 0;max-width:100%;">',
+            '<thead><tr>',
+        ]
+        for name in fieldnames:
+            parts.append(
+                f'<th style="font-weight:bold;background:#f3f3f3;text-align:left;">'
+                f'{html.escape(name)}</th>'
             )
-        generated_at_utc = datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M:%S UTC')
-        start_key = str(payload.get('start_date_param', 'start_date'))
-        end_key = str(payload.get('end_date_param', 'end_date'))
-        applied_start = params.get(start_key) if isinstance(params, dict) else None
-        applied_end = params.get(end_key) if isinstance(params, dict) else None
-        applied_range_html = (
-            f'<p><b>Applied Date Range:</b> {applied_start} to {applied_end} '
-            f'(keys: {start_key}, {end_key})</p>'
-            if applied_start and applied_end
-            else '<p><b>Applied Date Range:</b> Not specified in query parameters</p>'
+        parts.append('</tr></thead><tbody>')
+        for row in rows:
+            parts.append('<tr>')
+            for col_idx, fieldname in enumerate(fieldnames):
+                raw_value = row.get(fieldname)
+                css = cls._css_for_cell_value(raw_value, style_map.get(col_idx))
+                cell_html = cls._format_cell_display_value(raw_value)
+                if css:
+                    parts.append(f'<td style="{css}">{cell_html}</td>')
+                else:
+                    parts.append(f'<td>{cell_html}</td>')
+            parts.append('</tr>')
+        parts.append('</tbody></table>')
+        return ''.join(parts)
+
+    @classmethod
+    def _plain_text_to_html(cls, text: str) -> str:
+        stripped = text.strip()
+        if not stripped:
+            return ''
+        escaped = html.escape(stripped)
+        paragraphs = escaped.split('\n\n')
+        return ''.join(
+            f'<p>{paragraph.replace(chr(10), "<br>")}</p>'
+            for paragraph in paragraphs
+            if paragraph
         )
-        body = (
-            f'<p>Scheduled report: <b>{yaml_name or query_id}</b></p>'
-            f'<p><b>Datasource ID:</b> {datasource_id}</p>'
-            f'<p><b>Query ID:</b> {query_id}</p>'
-            f'<p><b>Generated At:</b> {generated_at_utc}</p>'
-            f'{applied_range_html}'
-            f'<p><b>Total Rows:</b> {len(rows)}</p>'
-            f'<p><b>Columns:</b> {len(fieldnames)}</p>'
-            '<p>The report has been generated successfully.</p>'
+
+    @classmethod
+    def _looks_like_html(cls, content: str) -> bool:
+        return bool(re.search(r'</?[a-zA-Z][^>]*>', content))
+
+    @classmethod
+    def _download_report_placeholder_html(cls, report: dict) -> str:
+        report_name = html.escape(str(report['report_name']))
+        report_size = int(report['report_size'])
+        report_url = report.get('report_url')
+        placeholder = (
+            f'<p><b>{report_name}</b> ({report_size:,} bytes) exceeds the email '
+            f'attachment limit.'
         )
-        if use_attachment:
-            body += (
-                f'<p><b>Delivery:</b> CSV attached ({csv_size:,} bytes, '
-                f'max {MAX_EMAIL_ATTACHMENT_BYTES // (1024 * 1024)} MB for email).</p>'
+        if report_url:
+            placeholder += (
+                f' <a href="{report_url}" target="_blank" '
+                'rel="noopener noreferrer">Download Excel report</a>'
             )
+        return f'{placeholder}</p>'
+
+    @classmethod
+    def _referenced_query_ids(cls, email_content: str | None) -> set[str]:
+        if not email_content or not email_content.strip():
+            return set()
+        return {
+            match.group(1)
+            for match in EMAIL_QUERY_PLACEHOLDER_PATTERN.finditer(email_content.strip())
+        }
+
+    @classmethod
+    def _build_query_tables_for_email(
+        cls,
+        prepared_reports: list[dict],
+        referenced_query_ids: set[str],
+    ) -> dict[str, str]:
+        if not referenced_query_ids:
+            return {}
+
+        query_tables: dict[str, str] = {}
+        for report in prepared_reports:
+            query_id = report['query_id']
+            if query_id not in referenced_query_ids:
+                continue
+            if report['use_attachment']:
+                query_tables[query_id] = cls._rows_to_html_table(
+                    report['rows'], column_styles=report.get('column_styles')
+                )
+            else:
+                query_tables[query_id] = cls._download_report_placeholder_html(report)
+        return query_tables
+
+    @classmethod
+    def _placeholder_table_html(
+        cls, query_id: str, query_tables: dict[str, str]
+    ) -> str:
+        if query_id in query_tables:
+            return query_tables[query_id]
+        return (
+            f'<p><em>No data for query '
+            f'<code>{html.escape(query_id)}</code></em></p>'
+        )
+
+    @classmethod
+    def _render_email_template(cls, template: str, query_tables: dict[str, str]) -> str:
+        if not EMAIL_QUERY_PLACEHOLDER_PATTERN.search(template):
+            if cls._looks_like_html(template):
+                return template
+            return cls._plain_text_to_html(template)
+
+        is_html = cls._looks_like_html(template)
+        parts: list[str] = []
+        last_end = 0
+        for match in EMAIL_QUERY_PLACEHOLDER_PATTERN.finditer(template):
+            static = template[last_end : match.start()]
+            if static:
+                parts.append(static if is_html else cls._plain_text_to_html(static))
+            parts.append(cls._placeholder_table_html(match.group(1), query_tables))
+            last_end = match.end()
+        trailing = template[last_end:]
+        if trailing:
+            parts.append(trailing if is_html else cls._plain_text_to_html(trailing))
+        return ''.join(parts)
+
+    @classmethod
+    def _rows_to_xlsx_bytes(
+        cls,
+        rows: list[dict],
+        column_styles: list[dict] | None = None,
+    ) -> tuple[bytes, list[str]]:
+        fieldnames = cls._fieldnames_from_rows(rows)
+
+        def cell_value(value):
+            if isinstance(value, (dict, list)):
+                return json.dumps(value)
+            return value if value is None or isinstance(value, str) else str(value)
+
+        workbook = Workbook()
+        worksheet = workbook.active
+        worksheet.title = 'Report'
+        style_map = cls._build_column_style_map(fieldnames, column_styles or [])
+        if fieldnames:
+            header_font = Font(bold=True)
+            for col_idx, fieldname in enumerate(fieldnames, start=1):
+                header_cell = worksheet.cell(row=1, column=col_idx, value=fieldname)
+                header_cell.font = header_font
+            for row_idx, row in enumerate(rows, start=2):
+                for col_idx, fieldname in enumerate(fieldnames, start=1):
+                    raw_value = row.get(fieldname)
+                    cell = worksheet.cell(
+                        row=row_idx, column=col_idx, value=cell_value(raw_value)
+                    )
+                    rules = style_map.get(col_idx - 1)
+                    if rules:
+                        cls._apply_cell_style(cell, raw_value, rules)
+
+        buf = io.BytesIO()
+        workbook.save(buf)
+        return buf.getvalue(), fieldnames
+
+    def _build_report_email_body(
+        self,
+        *,
+        report_names: list[str],
+        email_content: str | None,
+        query_tables: dict[str, str],
+        download_reports: list[dict],
+    ) -> str:
+        if email_content and email_content.strip():
+            body = self._render_email_template(email_content.strip(), query_tables)
+        elif len(report_names) == 1:
+            body = f'<p>Scheduled report: <b>{report_names[0]}</b></p>'
         else:
+            names_html = ', '.join(f'<b>{name}</b>' for name in report_names)
+            body = f'<p>Scheduled reports: {names_html}</p>'
+
+        if download_reports:
             body += (
-                f'<p><b>Delivery:</b> Report is {csv_size:,} bytes (over '
-                f'{MAX_EMAIL_ATTACHMENT_BYTES // (1024 * 1024)} MB email limit). '
-                'Use the download link below instead of an attachment.</p>'
-                '<p>The link is secure and expires in 7 days.</p>'
+                f'<p><b>Delivery:</b> The following report(s) exceed the '
+                f'{MAX_EMAIL_ATTACHMENT_BYTES // (1024 * 1024)} MB email attachment limit. '
+                'Use the download links below instead of attachments.</p>'
+                '<p>Links are secure and expire in 7 days.</p>'
             )
-            if report_url:
-                body += (
-                    f'<p><a href="{report_url}" target="_blank" rel="noopener noreferrer">'
-                    'Download CSV report (valid for 7 days)</a></p>'
+            for report in download_reports:
+                report_name = report['report_name']
+                report_size = report['report_size']
+                report_url = report.get('report_url')
+                body += f'<p><b>{report_name}</b> ({report_size:,} bytes)'
+                if report_url:
+                    body += (
+                        f' — <a href="{report_url}" target="_blank" '
+                        'rel="noopener noreferrer">Download Excel report</a>'
+                    )
+                body += '</p>'
+        return body
+
+    async def _get_datasource_plugin(
+        self, datasource_id: str
+    ) -> tuple[DatasourcePlugin, str, str]:
+        datasource_type, datasource_config = await get_datasource_config(
+            datasource_id=datasource_id,
+            datasource_repository=self.datasource_repository,
+        )
+        if not datasource_type or not datasource_config:
+            raise ValueError(f'Datasource not found: {datasource_id}')
+        return (
+            DatasourcePlugin(datasource_type, datasource_config),
+            datasource_type,
+            datasource_id,
+        )
+
+    async def _execute_email_dynamic_query_job(self, payload: dict, job_timezone: str):
+        query_specs = self._normalize_query_specs(payload)
+        recipient_user_ids = self._normalize_recipient_user_ids(payload)
+        email_content = payload.get('email_content')
+        if email_content is not None and not isinstance(email_content, str):
+            email_content = None
+
+        if not recipient_user_ids:
+            raise ValueError('payload must include recipient_user_ids')
+
+        merged_specs = [self._merge_query_spec(payload, spec) for spec in query_specs]
+        default_datasource_id = payload.get('datasource_id')
+        if not default_datasource_id and not all(
+            spec.get('datasource_id') for spec in merged_specs
+        ):
+            raise ValueError(
+                'payload must include datasource_id (job-level or on each query)'
+            )
+
+        query_ids = [spec['query_id'] for spec in merged_specs]
+        default_subject = payload.get('subject')
+        if not default_subject:
+            if len(query_ids) == 1:
+                default_subject = f'Scheduled Dynamic Query Report: {query_ids[0]}'
+            else:
+                default_subject = 'Scheduled Dynamic Query Reports'
+        subject = default_subject
+
+        datasource_plugins: dict[str, DatasourcePlugin] = {}
+        yaml_by_query_id: dict[str, tuple[list, str | None]] = {}
+
+        for spec in merged_specs:
+            query_id = spec['query_id']
+            datasource_id = spec.get('datasource_id')
+            if not datasource_id:
+                raise ValueError(
+                    f'datasource_id required for query_id={query_id} '
+                    '(set at job level or on the query entry)'
                 )
+            if datasource_id not in datasource_plugins:
+                plugin, _, _ = await self._get_datasource_plugin(datasource_id)
+                datasource_plugins[datasource_id] = plugin
+            if query_id not in yaml_by_query_id:
+                (
+                    yaml_query,
+                    yaml_name,
+                ) = await self.dynamic_query_service.get_dynamic_yaml_query(query_id)
+                if not yaml_query:
+                    raise ValueError(f'Dynamic query not found: {query_id}')
+                yaml_by_query_id[query_id] = (yaml_query, yaml_name)
+
+        failed_recipient_user_ids: list[str] = []
+        delivered_count = 0
+        run_timestamp = datetime.now(timezone.utc).strftime('%Y%m%d%H%M%S')
 
-        failed_recipients = []
-        for recipient in recipients:
-            attachments = None
-            if use_attachment:
-                attachments = [
+        for user_id in recipient_user_ids:
+            user = await self.user_repository.find_one(id=user_id)
+            if not user or user.deleted:
+                logger.warning(
+                    f'Scheduled report skipped: user not found or deleted ({user_id})'
+                )
+                failed_recipient_user_ids.append(user_id)
+                continue
+
+            try:
+                rls_filter_str = await self._rls_filter_for_user(user_id)
+            except Exception as exc:
+                logger.error(f'Scheduled report failed for user_id={user_id}: {exc}')
+                failed_recipient_user_ids.append(user_id)
+                continue
+
+            prepared_reports: list[dict] = []
+            report_names: list[str] = []
+            user_query_failed = False
+
+            for spec in merged_specs:
+                query_id = spec['query_id']
+                datasource_id = spec['datasource_id']
+                yaml_query, yaml_name = yaml_by_query_id[query_id]
+                datasource_plugin = datasource_plugins[datasource_id]
+                filter_expr = spec.get('filter')
+                offset = spec.get('offset', 0)
+                limit = spec.get('limit', 100)
+                params = self._resolve_runtime_params(spec, job_timezone)
+                column_styles = self._parse_column_styles_config(
+                    spec.get('column_styles')
+                )
+
+                try:
+                    rows = await self._fetch_dynamic_query_rows(
+                        datasource_plugin,
+                        yaml_query,
+                        query_id,
+                        rls_filter_str,
+                        filter_expr,
+                        offset,
+                        limit,
+                        params,
+                    )
+                except Exception as exc:
+                    logger.error(
+                        f'Scheduled report failed for user_id={user_id}, '
+                        f'query_id={query_id}: {exc}'
+                    )
+                    user_query_failed = True
+                    break
+
+                if len(rows) == 0:
+                    start_key = str(spec.get('start_date_param', 'start_date'))
+                    end_key = str(spec.get('end_date_param', 'end_date'))
+                    applied_start = (
+                        params.get(start_key) if isinstance(params, dict) else None
+                    )
+                    applied_end = (
+                        params.get(end_key) if isinstance(params, dict) else None
+                    )
+                    logger.info(
+                        f'No records for user_id={user_id}, query_id={query_id}; '
+                        f'range {applied_start}..{applied_end} (keys: {start_key}, {end_key}). '
+                        'Skipping this report.'
+                    )
+                    continue
+
+                report_bytes, _ = self._rows_to_xlsx_bytes(
+                    rows, column_styles=column_styles
+                )
+                report_size = len(report_bytes)
+                report_filename = self._build_report_filename(
+                    query_id=query_id,
+                    user_id=user_id,
+                    run_timestamp=run_timestamp,
+                    params=params,
+                    payload=spec,
+                )
+                report_name = yaml_name or query_id
+                report_names.append(report_name)
+                use_attachment = report_size <= MAX_EMAIL_ATTACHMENT_BYTES
+                report_url: str | None = None
+                if not use_attachment:
+                    report_key = f'scheduled_query_reports/{query_id}/{report_filename}'
+                    self.cloud_storage_manager.save_small_file(
+                        file_content=report_bytes,
+                        bucket_name=self.bucket_name,
+                        key=report_key,
+                        content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                    )
+                    report_url = self.cloud_storage_manager.generate_presigned_url(
+                        bucket_name=self.bucket_name,
+                        key=report_key,
+                        type='GET',
+                        expiresIn=SIGNED_URL_EXPIRY_SECONDS,
+                    )
+
+                prepared_reports.append(
                     {
+                        'query_id': query_id,
+                        'report_name': report_name,
+                        'report_size': report_size,
+                        'report_url': report_url,
+                        'use_attachment': use_attachment,
                         'filename': report_filename,
-                        'content_bytes': csv_bytes,
-                        'mime_type': 'text/csv',
+                        'content_bytes': report_bytes,
+                        'rows': rows,
+                        'column_styles': column_styles,
                     }
+                )
+
+            if user_query_failed:
+                failed_recipient_user_ids.append(user_id)
+                continue
+
+            if not prepared_reports:
+                logger.info(
+                    f'No reports with data for user_id={user_id}; skipping email.'
+                )
+                continue
+
+            download_reports = [
+                {
+                    'query_id': r['query_id'],
+                    'report_name': r['report_name'],
+                    'report_size': r['report_size'],
+                    'report_url': r['report_url'],
+                }
+                for r in prepared_reports
+                if not r['use_attachment']
+            ]
+            referenced_query_ids = self._referenced_query_ids(email_content)
+            query_tables = self._build_query_tables_for_email(
+                prepared_reports, referenced_query_ids
+            )
+            if referenced_query_ids:
+                download_reports = [
+                    report
+                    for report in download_reports
+                    if report['query_id'] not in referenced_query_ids
                 ]
+            body = self._build_report_email_body(
+                report_names=report_names,
+                email_content=email_content,
+                query_tables=query_tables,
+                download_reports=download_reports,
+            )
+            attachments = [
+                {
+                    'filename': r['filename'],
+                    'content_bytes': r['content_bytes'],
+                    'mime_type': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                }
+                for r in prepared_reports
+                if r['use_attachment']
+            ]
             is_sent = self.email_service.send_email(
                 subject,
                 body,
-                recipient,
-                attachments=attachments,
+                user.email,
+                attachments=attachments or None,
             )
             if not is_sent:
-                failed_recipients.append(recipient)
+                failed_recipient_user_ids.append(user_id)
+            else:
+                delivered_count += 1
 
-        if failed_recipients:
-            if len(failed_recipients) == len(recipients):
-                # Every send failed — no one has the report, so raising here is
-                # safe: the next-run retry will resend to all recipients without
-                # creating duplicates.
+        if failed_recipient_user_ids:
+            query_label = ', '.join(query_ids)
+            if delivered_count == 0 and len(failed_recipient_user_ids) == len(
+                recipient_user_ids
+            ):
                 raise ValueError(
-                    f'Failed sending report to all {len(recipients)} recipient(s) '
-                    f'for query={query_id}'
+                    f'Failed scheduled report for all {len(recipient_user_ids)} '
+                    f'recipient user(s) for queries={query_label}'
                 )
-            # Partial failure: some recipients already have the report.  Do NOT
-            # raise — that would schedule a retry which re-sends to the
-            # already-successful recipients.  Log the failures so they are
-            # visible in job.last_error via the caller, but let execution
-            # complete normally.
             logger.error(
-                f'Partial delivery failure for query={query_id}: '
-                f'{len(failed_recipients)}/{len(recipients)} recipient(s) failed: '
-                f'{", ".join(failed_recipients)}'
+                f'Partial delivery failure for queries={query_label}: '
+                f'{len(failed_recipient_user_ids)}/{len(recipient_user_ids)} '
+                f'recipient user(s) failed: '
+                f'{", ".join(failed_recipient_user_ids)}'
             )
 
     async def _run_job(self, job_row: dict):
diff --git a/wavefront/server/apps/floware/pyproject.toml b/wavefront/server/apps/floware/pyproject.toml
index 143f3995..80fcd43b 100644
--- a/wavefront/server/apps/floware/pyproject.toml
+++ b/wavefront/server/apps/floware/pyproject.toml
@@ -30,7 +30,8 @@ dependencies = [
     "python-multipart==0.0.9",
     "python-dotenv>=1.1.0,<2.0.0",
     "pottery>=3.0.1,<4.0.0",
-    "psycopg2-binary>=2.9.10,<3.0.0"
+    "psycopg2-binary>=2.9.10,<3.0.0",
+    "openpyxl>=3.1.5,<4.0.0",
 ]
 
 [tool.uv.sources]
diff --git a/wavefront/server/modules/user_management_module/user_management_module/services/email_service.py b/wavefront/server/modules/user_management_module/user_management_module/services/email_service.py
index 4430a2f6..d8555753 100644
--- a/wavefront/server/modules/user_management_module/user_management_module/services/email_service.py
+++ b/wavefront/server/modules/user_management_module/user_management_module/services/email_service.py
@@ -6,12 +6,12 @@
 import msal
 import requests
 import base64
-import json
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from email.mime.base import MIMEBase
 from email import encoders
-from google.oauth2 import service_account
+from google.auth.transport.requests import Request
+from google.oauth2.credentials import Credentials
 from googleapiclient.discovery import build
 
 
@@ -133,39 +133,39 @@ def send_email(
 
 
 class GmailEmailService(EmailService):
-    def __init__(self, service_account_b64, email_sender, delegate_user):
-        self.email_sender = email_sender or delegate_user
-        self.delegate_user = delegate_user
+    def __init__(self, client_id, client_secret, refresh_token, email_sender):
+        self.client_id = client_id
+        self.client_secret = client_secret
+        self.refresh_token = refresh_token
+        self.email_sender = email_sender
         self.scopes = ['https://www.googleapis.com/auth/gmail.send']
 
-        if not delegate_user:
-            raise Exception('Delegate user required for gmail')
-
-        try:
-            decoded_json = base64.b64decode(service_account_b64).decode('utf-8')
-            self.service_account_info = json.loads(decoded_json)
-        except Exception as e:
-            raise Exception(f'Invalid Gmail service account configuration: {str(e)}')
+        if not all([client_id, client_secret, refresh_token, email_sender]):
+            raise Exception(
+                'Gmail OAuth requires client_id, client_secret, refresh_token, and email_sender'
+            )
 
-    def get_access_token(self):
-        credentials = service_account.Credentials.from_service_account_info(
-            self.service_account_info, scopes=self.scopes
+    def get_credentials(self) -> Credentials:
+        creds = Credentials(
+            token=None,
+            refresh_token=self.refresh_token,
+            token_uri='https://oauth2.googleapis.com/token',
+            client_id=self.client_id,
+            client_secret=self.client_secret,
+            scopes=self.scopes,
         )
+        creds.refresh(Request())
+        return creds
 
-        credentials = credentials.with_subject(self.delegate_user)
+    def get_access_token(self):
+        return self.get_credentials()
 
-        return credentials
+    def _get_gmail_service(self):
+        return build('gmail', 'v1', credentials=self.get_credentials())
 
     def send_forget_password_email(self, forget_url_link: str, email: str) -> bool:
         try:
-            credentials = self.get_access_token()
-            if not credentials:
-                logger.error('failed to obtain gmail access token')
-                raise HTTPException(
-                    status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    detail='Failed to authenticate while sending the email.',
-                )
-            service = build('gmail', 'v1', credentials=credentials)
+            service = self._get_gmail_service()
 
             message = MIMEMultipart()
             message['to'] = email
@@ -206,14 +206,7 @@ def send_email(
         attachments: list[dict[str, Any]] | None = None,
     ) -> bool:
         try:
-            credentials = self.get_access_token()
-            if not credentials:
-                logger.error('failed to obtain gmail access token')
-                raise HTTPException(
-                    status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    detail='Failed to authenticate while sending the email.',
-                )
-            service = build('gmail', 'v1', credentials=credentials)
+            service = self._get_gmail_service()
             message = MIMEMultipart()
             message['to'] = email_id
             message['from'] = f'Rootflo Notifications <{self.email_sender}>'
diff --git a/wavefront/server/modules/user_management_module/user_management_module/user_container.py b/wavefront/server/modules/user_management_module/user_management_module/user_container.py
index 72496d54..2303f8b3 100644
--- a/wavefront/server/modules/user_management_module/user_management_module/user_container.py
+++ b/wavefront/server/modules/user_management_module/user_management_module/user_container.py
@@ -69,9 +69,10 @@ class UserContainer(containers.DeclarativeContainer):
         ),
         gmail=providers.Singleton(
             GmailEmailService,
-            service_account_b64=config.gmail.service_account_file,
+            client_id=config.gmail.client_id,
+            client_secret=config.gmail.client_secret,
+            refresh_token=config.gmail.refresh_token,
             email_sender=config.gmail.email_sender,
-            delegate_user=config.gmail.delegate_user,
         ),
     )
 
diff --git a/wavefront/server/uv.lock b/wavefront/server/uv.lock
index e4714500..0787bd79 100644
--- a/wavefront/server/uv.lock
+++ b/wavefront/server/uv.lock
@@ -1310,6 +1310,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/de/15/545e2b6cf2e3be84bc1ed85613edd75b8aea69807a71c26f4ca6a9258e82/email_validator-2.3.0-py3-none-any.whl", hash = "sha256:80f13f623413e6b197ae73bb10bf4eb0908faf509ad8362c5edeb0be7fd450b4", size = 35604, upload-time = "2025-08-26T13:09:05.858Z" },
 ]
 
+[[package]]
+name = "et-xmlfile"
+version = "2.0.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d3/38/af70d7ab1ae9d4da450eeec1fa3918940a5fafb9055e934af8d6eb0c2313/et_xmlfile-2.0.0.tar.gz", hash = "sha256:dab3f4764309081ce75662649be815c4c9081e88f0837825f90fd28317d4da54", size = 17234, upload-time = "2024-10-25T17:25:40.039Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c1/8b/5fe2cc11fee489817272089c4203e679c63b570a5aaeb18d852ae3cbba6a/et_xmlfile-2.0.0-py3-none-any.whl", hash = "sha256:7a91720bc756843502c3b7504c77b8fe44217c85c537d85037f0f536151b2caa", size = 18059, upload-time = "2024-10-25T17:25:39.051Z" },
+]
+
 [[package]]
 name = "extract-msg"
 version = "0.29.0"
@@ -1647,6 +1656,7 @@ dependencies = [
     { name = "inference-module" },
     { name = "knowledge-base-module" },
     { name = "llm-inference-config-module" },
+    { name = "openpyxl" },
     { name = "plugins-module" },
     { name = "pottery" },
     { name = "product-analysis-module" },
@@ -1672,6 +1682,7 @@ requires-dist = [
     { name = "inference-module", editable = "modules/inference_module" },
     { name = "knowledge-base-module", editable = "modules/knowledge_base_module" },
     { name = "llm-inference-config-module", editable = "modules/llm_inference_config_module" },
+    { name = "openpyxl", specifier = ">=3.1.5,<4.0.0" },
     { name = "plugins-module", editable = "modules/plugins_module" },
     { name = "pottery", specifier = ">=3.0.1,<4.0.0" },
     { name = "product-analysis-module", editable = "modules/product_analysis_module" },
@@ -3663,6 +3674,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a4/7d/f1c30a92854540bf789e9cd5dde7ef49bbe63f855b85a2e6b3db8135c591/opencv_python-4.11.0.86-cp37-abi3-win_amd64.whl", hash = "sha256:085ad9b77c18853ea66283e98affefe2de8cc4c1f43eda4c100cf9b2721142ec", size = 39488044, upload-time = "2025-01-16T13:52:21.928Z" },
 ]
 
+[[package]]
+name = "openpyxl"
+version = "3.1.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "et-xmlfile" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/3d/f9/88d94a75de065ea32619465d2f77b29a0469500e99012523b91cc4141cd1/openpyxl-3.1.5.tar.gz", hash = "sha256:cf0e3cf56142039133628b5acffe8ef0c12bc902d2aadd3e0fe5878dc08d1050", size = 186464, upload-time = "2024-06-28T14:03:44.161Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c0/da/977ded879c29cbd04de313843e76868e6e13408a94ed6b987245dc7c8506/openpyxl-3.1.5-py2.py3-none-any.whl", hash = "sha256:5282c12b107bffeef825f4617dc029afaf41d0ea60823bbb665ef3079dc79de2", size = 250910, upload-time = "2024-06-28T14:03:41.161Z" },
+]
+
 [[package]]
 name = "opentelemetry-api"
 version = "1.40.0"