diff --git a/apps/ui/src/components/ChangesViewer.vue b/apps/ui/src/components/ChangesViewer.vue
index ee403b39..0f94d6c5 100644
--- a/apps/ui/src/components/ChangesViewer.vue
+++ b/apps/ui/src/components/ChangesViewer.vue
@@ -105,7 +105,7 @@
               <td>
                 {{ job.finishedStr }}
                 ({{ job.durationStr }})
-                <button class="btn float-end" @click="showLogs(job)">Logs</button>
+                <a class="btn float-end" :href="'#drive_logs:job-' + job.id" @click.prevent="showLogs(job)">Logs</a>
               </td>
             </tr>
             </tbody>
@@ -177,11 +177,7 @@ export default {
       }
     },
     showLogs(job) {
-      this.$emit('showLogs', {
-        from: job.started,
-        until: job.finished
-      });
-      this.setActiveTab('drive_logs');
+      this.setActiveTab('drive_logs:job-' + job.id);
     }
   }
 };
diff --git a/apps/ui/src/components/JobLogsViewer.vue b/apps/ui/src/components/JobLogsViewer.vue
new file mode 100644
index 00000000..345d7647
--- /dev/null
+++ b/apps/ui/src/components/JobLogsViewer.vue
@@ -0,0 +1,143 @@
+<template>
+  <div class="x-container mainbar__content-height">
+    <StatusToolBar :active-tab="activeTab">
+    </StatusToolBar>
+
+    <div class="btn-toolbar">
+      <div class="flex-grow-1"></div>
+      <button class="btn btn-sm" @click="errorsOnly = !errorsOnly">{{ errorsOnly ? 'Show all logs' : 'Show errors only' }}</button>
+    </div>
+
+    <pre class="bg-dark text-white log-viewer overflow-auto"
+    ><div v-for="(item, idx) of logsFiltered" :key="idx" :class="{'text-danger': 'error' === item.level, 'text-warning': 'warn' === item.level}"
+    ><span>[{{dateStr(item.timestamp)}}]</span
+    > <span v-html="getLink(item.filename)"></span
+    > <span v-html="highLight(item.message)"></span
+    ></div>
+  </pre>
+  </div>
+</template>
+
+<script>
+import {UtilsMixin} from './UtilsMixin.ts';
+import StatusToolBar from './StatusToolBar.vue';
+
+import {Prism} from './prismFix';
+
+export default {
+  mixins: [UtilsMixin],
+  components: {StatusToolBar},
+  props: {
+    activeTab: {
+      type: String
+    },
+    jobId: {
+      type: String
+    },
+    contentDir: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      errorsOnly: false,
+      logs: []
+    };
+  },
+  computed: {
+    absPath() {
+      return '/drive/' + this.driveId + this.contentDir;
+    },
+    logsFiltered() {
+      let retVal = this.logs;
+      if (this.errorsOnly) {
+        retVal = retVal.filter(item => ['error', 'warn'].includes(item.level));
+      }
+      return retVal;
+    }
+  },
+  methods: {
+    async fetch() {
+      if (!this.jobId || !this.jobId.startsWith('job-')) {
+        return;
+      }
+      const jobId = this.jobId.substring('job-'.length);
+
+      const response = await this.authenticatedClient.fetchApi(`/api/logs/${this.driveId}?order=asc&jobId=` + (jobId));
+      const logs = await response.json();
+      if (logs.length === 0) {
+        return;
+      }
+
+      this.logs = logs;
+
+      if (logs.length > 0) {
+        this.handleScroll();
+      }
+    },
+    handleScroll() {
+      const scroller = document.querySelector('.mainbar__content-height > pre');
+      if (scroller) {
+        const oldScrollTop = scroller.scrollHeight - scroller.offsetHeight - 10;
+        if (scroller.scrollTop < oldScrollTop) {
+          this.$nextTick(() => {
+            const scroller = document.querySelector('.mainbar__content-height > pre');
+            if (scroller) {
+              scroller.scrollTop = scroller.scrollHeight - scroller.offsetHeight;
+            }
+          });
+        }
+      }
+      this.$nextTick(() => {
+        this.rewriteLinks();
+      });
+    },
+    getLink(fileName) {
+      if (!fileName) {
+        return '';
+      }
+      const [path, line] = fileName.split(':');
+      const branch = window.location.hostname === 'wikigdrive.com' ? 'master' : 'develop';
+      const url = `https://github.com/mieweb/wikiGDrive/blob/${branch}/${path}#L${line}`;
+      let baseName = path.split('/').pop();
+      return `<a target="github" href="${url}">${baseName}</a>`;
+    },
+    dateStr(v) {
+      if (!v) {
+        return '';
+      }
+      return new Date(v).toISOString();
+    },
+    highLight(str) {
+      return Prism.highlight(str, Prism.languages.markdown, 'markdown');
+    },
+    rewriteLinks() {
+      const links = this.$el.querySelectorAll('a[data-to-rewrite]');
+      for (const link of links) {
+        const href = link.getAttribute('href');
+        if (href.endsWith('.md')) {
+          link.setAttribute('href', this.absPath + '/' + href + '#markdown');
+          link.addEventListener('click', event => {
+            event.preventDefault();
+            this.$router.push(link.getAttribute('href'));
+          });
+        } else
+        if (href.endsWith('.svg')) {
+          link.setAttribute('href', this.absPath + '/' + href);
+          link.addEventListener('click', event => {
+            event.preventDefault();
+            this.$router.push(link.getAttribute('href'));
+          });
+        }
+        link.removeAttribute('data-to-rewrite');
+      }
+    }
+  },
+  async mounted() {
+    await this.fetch();
+
+    this.handleScroll();
+    // Prism.highlightElement(this.$refs.code);
+  }
+};
+</script>
diff --git a/apps/ui/src/components/UiMixin.ts b/apps/ui/src/components/UiMixin.ts
index e8010643..c2a41c48 100644
--- a/apps/ui/src/components/UiMixin.ts
+++ b/apps/ui/src/components/UiMixin.ts
@@ -1,5 +1,3 @@
-export const DEFAULT_TAB = 'html';
-
 export const UiMixin = {
   data() {
     return {
diff --git a/apps/ui/src/components/UtilsMixin.ts b/apps/ui/src/components/UtilsMixin.ts
index d458ced9..6a2ee54d 100644
--- a/apps/ui/src/components/UtilsMixin.ts
+++ b/apps/ui/src/components/UtilsMixin.ts
@@ -1,3 +1,5 @@
+export const DEFAULT_TAB = 'html';
+
 export async function disableElement(event, handler) {
   const origAttr = event.target.getAttribute('disabled');
   if ('disabled' === origAttr) {
@@ -111,6 +113,10 @@ export const UtilsMixin = {
     }
   },
   methods: {
+    getActiveTab() {
+      const parts = (this.$route.hash.replace(/^#/, '') || DEFAULT_TAB).split(':');
+      return parts;
+    },
     setActiveTab(tab, selectedFilePath) {
       if (this.isAddon) {
         if (this.fullDrivePath) {
diff --git a/apps/ui/src/pages/FolderView.vue b/apps/ui/src/pages/FolderView.vue
index 603484f6..342f1b55 100644
--- a/apps/ui/src/pages/FolderView.vue
+++ b/apps/ui/src/pages/FolderView.vue
@@ -28,7 +28,12 @@
         <GitSettings v-if="activeTab === 'git_settings'" :active-tab="activeTab" :tree-empty="treeEmpty" />
 
         <DriveTools v-if="activeTab === 'drive_tools'" :folderPath="folderPath" :selectedFile="selectedFile" :selected-folder="selectedFolder" :active-tab="activeTab" />
-        <LogsViewer v-if="activeTab === 'drive_logs'" :contentDir="contentDir" :active-tab="activeTab" v-model="logsState" />
+
+        <div v-if="activeTab === 'drive_logs'">
+          <JobLogsViewer v-if="activeTabParams[0]" contentDir="contentDir" :active-tab="activeTab" :jobId="activeTabParams[0]" />
+          <LogsViewer v-else :contentDir="contentDir" :active-tab="activeTab" v-model="logsState" />
+        </div>
+
         <ZipkinViewer v-if="activeTab === 'performance'" :active-tab="activeTab" />
         <DangerSettings v-if="activeTab === 'drive_danger'" :activeTab="activeTab" />
         <UserSettings v-if="activeTab === 'drive_config' || activeTab === 'drive_config_git'" :activeTab="activeTab" />
@@ -95,8 +100,8 @@
 </template>
 <script lang="ts">
 import BaseLayout from '../layout/BaseLayout.vue';
-import {DEFAULT_TAB, UiMixin} from '../components/UiMixin.ts';
-import {UtilsMixin} from '../components/UtilsMixin.ts';
+import {UiMixin} from '../components/UiMixin.ts';
+import {DEFAULT_TAB, UtilsMixin} from '../components/UtilsMixin.ts';
 import FilesTree from '../components/FilesTree.vue';
 import NotRegistered from './NotRegistered.vue';
 import FilePreview from '../components/FilePreview.vue';
@@ -106,6 +111,7 @@ import FileEditor from '../components/FileEditor.vue';
 import NavTabs from '../components/NavTabs.vue';
 import NavSearch from '../components/NavSearch.vue';
 import LogsViewer from '../components/LogsViewer.vue';
+import JobLogsViewer from '../components/JobLogsViewer.vue';
 import ZipkinViewer from '../components/ZipkinViewer.vue';
 import ChangesViewer from '../components/ChangesViewer.vue';
 import UserSettings from '../components/UserSettings.vue';
@@ -134,6 +140,7 @@ export default {
     IframePreview,
     FileEditor,
     LogsViewer,
+    JobLogsViewer,
     ZipkinViewer,
     ChangesViewer,
     UserSettings,
@@ -150,8 +157,12 @@ export default {
       folderPath: '',
       contentDir: '',
       activeTab: DEFAULT_TAB,
+      activeTabParams: [],
       files: [],
-      selectedFile: {},
+      selectedFile: {
+        id: null,
+        mimeType: ''
+      },
       selectedFolder: {},
       driveEmpty: false,
       treeEmpty: false,
@@ -193,11 +204,11 @@ export default {
   watch: {
     async $route() {
       await this.fetch();
-      this.activeTab = this.$route.hash.replace(/^#/, '') || DEFAULT_TAB;
+      [this.activeTab, ...this.activeTabParams] = this.getActiveTab();
     }
   },
   mounted() {
-    this.activeTab = this.$route.hash.replace(/^#/, '') || DEFAULT_TAB;
+    [this.activeTab, ...this.activeTabParams] = this.getActiveTab();
   },
   methods: {
     async fetchFolder(driveId, filePath) {
diff --git a/apps/ui/src/pages/GDocsView.vue b/apps/ui/src/pages/GDocsView.vue
index 70878cb4..d5d6390d 100644
--- a/apps/ui/src/pages/GDocsView.vue
+++ b/apps/ui/src/pages/GDocsView.vue
@@ -205,8 +205,8 @@
 <script lang="js">
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
-import {DEFAULT_TAB, UiMixin} from '../components/UiMixin.ts';
-import {disableElement, UtilsMixin} from '../components/UtilsMixin.ts';
+import {UiMixin} from '../components/UiMixin.ts';
+import {DEFAULT_TAB, disableElement, UtilsMixin} from '../components/UtilsMixin.ts';
 import {GitMixin} from '../components/GitMixin.ts';
 import BaseLayout from '../layout/BaseLayout.vue';
 import NotRegistered from './NotRegistered.vue';
@@ -237,6 +237,7 @@ export default {
       untransformed: null,
       commitMsg: '',
       activeTab: DEFAULT_TAB,
+      activeTabParams: [],
       folderPath: '',
       contentDir: '',
       selectedFile: {},
@@ -287,14 +288,14 @@ export default {
   watch: {
     async $route() {
       await this.fetch();
-      this.activeTab = this.$route.hash.replace(/^#/, '') || DEFAULT_TAB;
+      [this.activeTab, ...this.activeTabParams] = this.getActiveTab();
     },
     async active_jobs() {
       await this.fetch();
     }
   },
   mounted() {
-    this.activeTab = this.$route.hash.replace(/^#/, '') || DEFAULT_TAB;
+    [this.activeTab, ...this.activeTabParams] = this.getActiveTab();
   },
   methods: {
     async commitSinglePush(event) {
diff --git a/src/containers/action/ActionRunnerContainer.ts b/src/containers/action/ActionRunnerContainer.ts
index db590916..aba9bb59 100644
--- a/src/containers/action/ActionRunnerContainer.ts
+++ b/src/containers/action/ActionRunnerContainer.ts
@@ -76,7 +76,7 @@ export class ActionRunnerContainer extends Container {
 
   async init(engine: ContainerEngine): Promise<void> {
     await super.init(engine);
-    this.logger = engine.logger.child({ filename: __filename, driveId: this.params.name });
+    this.logger = engine.logger.child({ filename: __filename, driveId: this.params.name, jobId: this.params.jobId });
   }
 
   async convertActionYaml(actionYaml: string): Promise<ActionDefinition[]> {
diff --git a/src/containers/changes/WatchChangesContainer.ts b/src/containers/changes/WatchChangesContainer.ts
index 03c3d9c3..388af46a 100644
--- a/src/containers/changes/WatchChangesContainer.ts
+++ b/src/containers/changes/WatchChangesContainer.ts
@@ -6,7 +6,7 @@ import {fileURLToPath} from 'url';
 import {FolderRegistryContainer} from '../folder_registry/FolderRegistryContainer';
 import {GoogleFile} from '../../model/GoogleFile';
 import {GoogleTreeProcessor} from '../google_folder/GoogleTreeProcessor';
-import {JobManagerContainer} from '../job/JobManagerContainer';
+import {initJob, JobManagerContainer} from '../job/JobManagerContainer';
 import {UserConfigService} from '../google_folder/UserConfigService';
 import {type FileId} from '../../model/model';
 import {TelemetryClass, TelemetryMethod, TelemetryMethodDisable} from '../../telemetry';
@@ -93,11 +93,13 @@ export class WatchChangesContainer extends Container {
 
       const jobManagerContainer = <JobManagerContainer>this.engine.getContainer('job_manager');
       await jobManagerContainer.schedule(driveId, {
+        ...initJob(),
         type: 'sync',
         payload: fileIdsString,
         title: 'Syncing file: ' + fileIdsString
       });
       await jobManagerContainer.schedule(driveId, {
+        ...initJob(),
         type: 'transform',
         title: 'Transform markdown'
       });
diff --git a/src/containers/google_folder/GoogleFolderContainer.ts b/src/containers/google_folder/GoogleFolderContainer.ts
index aaf63fc1..f8afab32 100644
--- a/src/containers/google_folder/GoogleFolderContainer.ts
+++ b/src/containers/google_folder/GoogleFolderContainer.ts
@@ -44,7 +44,7 @@ export class GoogleFolderContainer extends Container {
 
   async init(engine: ContainerEngine): Promise<void> {
     await super.init(engine);
-    this.logger = engine.logger.child({ filename: __filename, driveId: this.params.name });
+    this.logger = engine.logger.child({ filename: __filename, driveId: this.params.name, jobId: this.params.jobId });
     const googleApiContainer: GoogleApiContainer = <GoogleApiContainer>this.engine.getContainer('google_api');
     this.googleDriveService = new GoogleDriveService(this.logger, googleApiContainer.getQuotaLimiter());
     this.auth = googleApiContainer.getAuth();
diff --git a/src/containers/google_folder/UploadContainer.ts b/src/containers/google_folder/UploadContainer.ts
index 865c30d9..f288f250 100644
--- a/src/containers/google_folder/UploadContainer.ts
+++ b/src/containers/google_folder/UploadContainer.ts
@@ -50,7 +50,7 @@ export class UploadContainer extends Container {
 
   async init(engine: ContainerEngine): Promise<void> {
     await super.init(engine);
-    this.logger = engine.logger.child({ filename: __filename, driveId: this.params.name });
+    this.logger = engine.logger.child({ filename: __filename, driveId: this.params.name, jobId: this.params.jobId });
     this.googleDriveService = new GoogleDriveService(this.logger, null);
     // this.auth = googleApiContainer.getAuth();
   }
diff --git a/src/containers/job/JobManagerContainer.ts b/src/containers/job/JobManagerContainer.ts
index c687aa6f..8d107a51 100644
--- a/src/containers/job/JobManagerContainer.ts
+++ b/src/containers/job/JobManagerContainer.ts
@@ -26,11 +26,18 @@ const __filename = fileURLToPath(import.meta.url);
 export type JobType = 'sync' | 'sync_all' | 'transform' | 'git_pull' | 'git_push' | 'git_reset' | 'git_commit' | 'run_action' | 'upload';
 export type JobState = 'waiting' | 'running' | 'failed' | 'done';
 
+export function initJob(): { id: string, state: JobState } {
+  return {
+    id: randomUUID(),
+    state: 'waiting'
+  };
+}
+
 export interface Job {
-  id?: string;
+  id: string;
+  state: JobState;
   progress?: { total: number; completed: number; warnings: number };
   type: JobType;
-  state?: JobState;
   title: string;
   trigger?: string;
   payload?: string;
@@ -152,7 +159,6 @@ export class JobManagerContainer extends Container {
   }
 
   async schedule(driveId: FileId, job: Job) {
-    job.id = randomUUID();
     job.state = 'waiting';
     job.ts = +new Date();
 
@@ -429,11 +435,12 @@ export class JobManagerContainer extends Container {
     }, 100);
   }
 
-  private async transform(folderId: FileId, filesIds: FileId[] = []) {
+  private async transform(folderId: FileId, jobId: string, filesIds: FileId[] = []) {
     const watchChangesContainer = <WatchChangesContainer>this.engine.getContainer('watch_changes');
     const changesToFetch: GoogleFile[] = await watchChangesContainer.getChanges(folderId);
     const transformContainer = new TransformContainer({
-      name: folderId
+      name: folderId,
+      jobId
     }, { filesIds });
     const transformedFileSystem = await this.filesService.getSubFileService(folderId + '_transform', '/');
     const googleFileSystem = await this.filesService.getSubFileService(folderId, '/');
@@ -477,11 +484,12 @@ export class JobManagerContainer extends Container {
     }
   }
 
-  private async upload(folderId: FileId, access_token: string) {
+  private async upload(folderId: FileId, jobId: string, access_token: string) {
     const uploadContainer = new UploadContainer({
       cmd: 'pull',
       name: folderId,
       folderId: folderId,
+      jobId,
       apiContainer: 'google_api',
       access_token
     });
@@ -516,11 +524,12 @@ export class JobManagerContainer extends Container {
     }
   }
 
-  private async sync(folderId: FileId, filesIds: FileId[] = []) {
+  private async sync(folderId: FileId, jobId: string, filesIds: FileId[] = []) {
     const downloadContainer = new GoogleFolderContainer({
       cmd: 'pull',
       name: folderId,
       folderId: folderId,
+      jobId,
       apiContainer: 'google_api'
     }, { filesIds });
 
@@ -550,9 +559,10 @@ export class JobManagerContainer extends Container {
     }
   }
 
-  private async runAction(folderId: FileId, trigger: string, payload: string, user?: { name: string, email: string }) {
+  private async runAction(folderId: FileId, jobId: string, trigger: string, payload: string, user?: { name: string, email: string }) {
     const runActionContainer = new ActionRunnerContainer({
       name: folderId,
+      jobId,
       trigger,
       payload,
       user_name: user?.name || 'WikiGDrive',
@@ -576,8 +586,8 @@ export class JobManagerContainer extends Container {
     }
   }
 
-  private async gitPull(driveId: FileId) {
-    const logger = this.engine.logger.child({ filename: __filename, driveId });
+  private async gitPull(driveId: FileId, jobId: string) {
+    const logger = this.engine.logger.child({ filename: __filename, driveId, jobId });
     try {
       const transformedFileSystem = await this.filesService.getSubFileService(driveId + '_transform', '');
       const gitScanner = new GitScanner(logger, transformedFileSystem.getRealPath(), 'wikigdrive@wikigdrive.com');
@@ -592,6 +602,7 @@ export class JobManagerContainer extends Container {
       });
 
       await this.schedule(driveId, {
+        ...initJob(),
         type: 'run_action',
         title: 'Run action: on git_pull',
         trigger: 'git_pull'
@@ -607,8 +618,8 @@ export class JobManagerContainer extends Container {
     }
   }
 
-  private async gitPush(driveId: FileId) {
-    const logger = this.engine.logger.child({filename: __filename, driveId});
+  private async gitPush(driveId: FileId, jobId: string) {
+    const logger = this.engine.logger.child({ filename: __filename, driveId, jobId });
 
     try {
       const transformedFileSystem = await this.filesService.getSubFileService(driveId + '_transform', '');
@@ -633,8 +644,8 @@ export class JobManagerContainer extends Container {
     }
   }
 
-  private async gitCommit(driveId: FileId, message: string, filePaths: string[], removeFilePaths: string[], user) {
-    const logger = this.engine.logger.child({filename: __filename, driveId});
+  private async gitCommit(driveId: FileId, jobId: string, message: string, filePaths: string[], removeFilePaths: string[], user) {
+    const logger = this.engine.logger.child({ filename: __filename, driveId, jobId });
 
     const transformedFileSystem = await this.filesService.getSubFileService(driveId + '_transform', '');
     const gitScanner = new GitScanner(logger, transformedFileSystem.getRealPath(), 'wikigdrive@wikigdrive.com');
@@ -664,6 +675,7 @@ export class JobManagerContainer extends Container {
     await gitScanner.commit(message, filePaths, removeFilePaths, user);
 
     await this.schedule(driveId, {
+      ...initJob(),
       type: 'run_action',
       title: 'Run action: on commit',
       trigger: 'commit',
@@ -671,8 +683,8 @@ export class JobManagerContainer extends Container {
     });
   }
 
-  private async gitReset(driveId: FileId, type: string) {
-    const logger = this.engine.logger.child({filename: __filename, driveId});
+  private async gitReset(driveId: FileId, jobId: string, type: string) {
+    const logger = this.engine.logger.child({ filename: __filename, driveId, jobId });
 
     try {
       const transformedFileSystem = await this.filesService.getSubFileService(driveId + '_transform', '');
@@ -707,6 +719,7 @@ export class JobManagerContainer extends Container {
       }
 
       await this.schedule(driveId, {
+        ...initJob(),
         type: 'run_action',
         title: 'Run action: on git_reset',
         trigger: 'git_reset'
@@ -740,6 +753,7 @@ export class JobManagerContainer extends Container {
     if (filesToRetry.length > 0) {
       for (const change of filesToRetry) {
         await this.schedule(driveId, {
+          ...initJob(),
           type: 'sync',
           startAfter: now + 10 * 1000,
           payload: change.id,
@@ -754,14 +768,14 @@ export class JobManagerContainer extends Container {
     logger.info('runJob ' + driveId + ' ' + JSON.stringify(currentJob));
     switch (currentJob.type) {
       case 'sync':
-        await this.sync(driveId, currentJob.payload.split(','));
+        await this.sync(driveId, currentJob.id, currentJob.payload.split(','));
         break;
       case 'sync_all':
-        await this.sync(driveId);
+        await this.sync(driveId, currentJob.id);
         break;
       case 'transform':
         try {
-          await this.transform(driveId, currentJob.payload ? [ currentJob.payload ] : [] );
+          await this.transform(driveId, currentJob.id, currentJob.payload ? [ currentJob.payload ] : [] );
           await this.clearGitCache(driveId);
 
           driveJobs.jobs = driveJobs.jobs.filter(removeOldByType('transform'));
@@ -772,6 +786,7 @@ export class JobManagerContainer extends Container {
           });
 
           await this.schedule(driveId, {
+            ...initJob(),
             type: 'run_action',
             title: 'Run action: on ' + currentJob.type,
             payload: currentJob.payload || 'all',
@@ -793,7 +808,7 @@ export class JobManagerContainer extends Container {
         break;
       case 'run_action':
         try {
-          await this.runAction(driveId, currentJob.trigger, currentJob.payload, currentJob.user);
+          await this.runAction(driveId, currentJob.id, currentJob.trigger, currentJob.payload, currentJob.user);
           await this.clearGitCache(driveId);
 
           this.engine.emit(driveId, 'toasts:added', {
@@ -816,7 +831,7 @@ export class JobManagerContainer extends Container {
         break;
       case 'git_pull':
         try {
-          await this.gitPull(driveId);
+          await this.gitPull(driveId, currentJob.id);
           await this.clearGitCache(driveId);
           driveJobs.jobs = driveJobs.jobs.filter(removeOldByType('git_pull'));
           this.engine.emit(driveId, 'toasts:added', {
@@ -828,6 +843,7 @@ export class JobManagerContainer extends Container {
           });
 
           await this.schedule(driveId, {
+            ...initJob(),
             type: 'transform',
             title: 'Transform markdown'
           });
@@ -845,22 +861,22 @@ export class JobManagerContainer extends Container {
         }
         break;
       case 'git_push':
-        await this.gitPush(driveId);
+        await this.gitPush(driveId, currentJob.id);
         await this.clearGitCache(driveId);
         break;
       case 'git_commit':
         {
           const { message, filePaths, removeFilePaths, user } = JSON.parse(currentJob.payload);
-          await this.gitCommit(driveId, message, filePaths, removeFilePaths, user);
+          await this.gitCommit(driveId, currentJob.id, message, filePaths, removeFilePaths, user);
           await this.clearGitCache(driveId);
         }
         break;
       case 'git_reset':
-        await this.gitReset(driveId, currentJob.payload);
+        await this.gitReset(driveId, currentJob.id, currentJob.payload);
         await this.clearGitCache(driveId);
         break;
       case 'upload':
-        await this.upload(driveId, currentJob.access_token);
+        await this.upload(driveId, currentJob.id, currentJob.access_token);
         break;
 
     }
diff --git a/src/containers/server/ServerContainer.ts b/src/containers/server/ServerContainer.ts
index 2aaaf308..921a0def 100644
--- a/src/containers/server/ServerContainer.ts
+++ b/src/containers/server/ServerContainer.ts
@@ -9,7 +9,7 @@ import {saveRunningInstance} from './loadRunningInstance';
 import {urlToFolderId} from '../../utils/idParsers';
 import {GoogleDriveService} from '../../google/GoogleDriveService';
 import {FolderRegistryContainer} from '../folder_registry/FolderRegistryContainer';
-import {DriveJobsMap, JobManagerContainer} from '../job/JobManagerContainer';
+import {DriveJobsMap, initJob, JobManagerContainer} from '../job/JobManagerContainer';
 import {fileURLToPath} from 'url';
 import GitController from './routes/GitController';
 import FolderController from './routes/FolderController';
@@ -447,6 +447,7 @@ export class ServerContainer extends Container {
 
         const jobManagerContainer = <JobManagerContainer>this.engine.getContainer('job_manager');
         await jobManagerContainer.schedule(driveId, {
+          ...initJob(),
           type: 'run_action',
           title: 'Run action: on ' + req.params.trigger,
           trigger: req.params.trigger,
@@ -466,6 +467,7 @@ export class ServerContainer extends Container {
 
         const jobManagerContainer = <JobManagerContainer>this.engine.getContainer('job_manager');
         await jobManagerContainer.schedule(driveId, {
+          ...initJob(),
           type: 'transform',
           title: 'Transform Markdown'
         });
@@ -483,6 +485,7 @@ export class ServerContainer extends Container {
 
         const jobManagerContainer = <JobManagerContainer>this.engine.getContainer('job_manager');
         await jobManagerContainer.schedule(driveId, {
+          ...initJob(),
           type: 'transform',
           payload: fileId,
           title: 'Transform Single'
@@ -500,10 +503,12 @@ export class ServerContainer extends Container {
 
         const jobManagerContainer = <JobManagerContainer>this.engine.getContainer('job_manager');
         await jobManagerContainer.schedule(driveId, {
+          ...initJob(),
           type: 'sync_all',
           title: 'Syncing all'
         });
         await jobManagerContainer.schedule(driveId, {
+          ...initJob(),
           type: 'transform',
           title: 'Transform markdown'
         });
@@ -531,11 +536,13 @@ export class ServerContainer extends Container {
 
         const jobManagerContainer = <JobManagerContainer>this.engine.getContainer('job_manager');
         await jobManagerContainer.schedule(driveId, {
+          ...initJob(),
           type: 'sync',
           payload: fileId,
           title: 'Syncing file: ' + fileTitle
         });
         await jobManagerContainer.schedule(driveId, {
+          ...initJob(),
           type: 'transform',
           payload: fileId,
           title: 'Transform markdown'
diff --git a/src/containers/server/auth.ts b/src/containers/server/auth.ts
index d3dd9a71..5de5fefc 100644
--- a/src/containers/server/auth.ts
+++ b/src/containers/server/auth.ts
@@ -6,7 +6,7 @@ import {Request, Response} from 'express';
 import {UserAuthClient} from '../../google/AuthClient';
 import {FolderRegistryContainer} from '../folder_registry/FolderRegistryContainer';
 import {urlToFolderId} from '../../utils/idParsers';
-import {JobManagerContainer} from '../job/JobManagerContainer';
+import {initJob, JobManagerContainer} from '../job/JobManagerContainer';
 
 export class AuthError extends Error {
   public status: number;
@@ -191,6 +191,7 @@ export async function getAuth(req, res: Response, next) {
 
       const jobManagerContainer = <JobManagerContainer>this.engine.getContainer('job_manager');
       await jobManagerContainer.schedule(driveId, {
+        ...initJob(),
         type: 'upload',
         title: 'Uploading to Google Drive',
         access_token: await authClient.getAccessToken()
diff --git a/src/containers/server/routes/GitController.ts b/src/containers/server/routes/GitController.ts
index 58c789e6..09d6c862 100644
--- a/src/containers/server/routes/GitController.ts
+++ b/src/containers/server/routes/GitController.ts
@@ -2,7 +2,7 @@ import {Controller, RouteGet, RouteParamBody, RouteParamPath, RouteParamUser, Ro
 import {GitScanner} from '../../../git/GitScanner';
 import {UserConfigService} from '../../google_folder/UserConfigService';
 import {FileContentService} from '../../../utils/FileContentService';
-import {JobManagerContainer} from '../../job/JobManagerContainer';
+import {initJob, JobManagerContainer} from '../../job/JobManagerContainer';
 import {ContainerEngine} from '../../../ContainerEngine';
 
 interface CommitPost {
@@ -73,6 +73,7 @@ export default class GitController extends Controller {
       : (body.removeFilePath ? [body.removeFilePath] : []);
 
     await this.jobManagerContainer.schedule(driveId, {
+      ...initJob(),
       type: 'git_commit',
       title: 'Git Commit',
       payload: JSON.stringify({
@@ -95,6 +96,7 @@ export default class GitController extends Controller {
   @RoutePost('/:driveId/pull')
   async pull(@RouteParamPath('driveId') driveId: string) {
     await this.jobManagerContainer.schedule(driveId, {
+      ...initJob(),
       type: 'git_pull',
       title: 'Git Pull'
     });
@@ -104,6 +106,7 @@ export default class GitController extends Controller {
   @RoutePost('/:driveId/push')
   async push(@RouteParamPath('driveId') driveId: string) {
     await this.jobManagerContainer.schedule(driveId, {
+      ...initJob(),
       type: 'git_push',
       title: 'Git Push'
     });
@@ -114,6 +117,7 @@ export default class GitController extends Controller {
   @RoutePost('/:driveId/reset_remote')
   async resetRemote(@RouteParamPath('driveId') driveId: string) {
     await this.jobManagerContainer.schedule(driveId, {
+      ...initJob(),
       type: 'git_reset',
       title: 'Git Reset to Remote',
       payload: 'remote'
@@ -125,6 +129,7 @@ export default class GitController extends Controller {
   @RoutePost('/:driveId/reset_local')
   async resetLocal(@RouteParamPath('driveId') driveId: string) {
     await this.jobManagerContainer.schedule(driveId, {
+      ...initJob(),
       type: 'git_reset',
       title: 'Git Reset to Local',
       payload: 'local'
diff --git a/src/containers/server/routes/LogsController.ts b/src/containers/server/routes/LogsController.ts
index 0d7f5564..d7a522da 100644
--- a/src/containers/server/routes/LogsController.ts
+++ b/src/containers/server/routes/LogsController.ts
@@ -11,6 +11,7 @@ export class LogsController extends Controller {
   async getConfig(@RouteParamPath('driveId') driveId: string,
                   @RouteParamQuery('from') from?: number,
                   @RouteParamQuery('until') until?: number,
+                  @RouteParamQuery('jobId') jobId?: string,
                   @RouteParamQuery('order') order?: 'desc' | 'asc'
                   ) {
 
@@ -22,9 +23,10 @@ export class LogsController extends Controller {
       }
     }
 
-    const options: QueryOptions = {
+    const options: any = {
       from: from ? new Date(+from) : undefined,
       until: until ? new Date(+until) : undefined,
+      jobId,
       order: order || 'asc',
       start: 0,
       limit: 100,
@@ -41,6 +43,10 @@ export class LogsController extends Controller {
       }
     }));
 
+    if (jobId) {
+      return results['jobLogFile'];
+    }
+
     return results['dailyRotateFile'].reverse();
   }
 
diff --git a/src/containers/transform/TransformContainer.ts b/src/containers/transform/TransformContainer.ts
index 45f995a4..ff21c669 100644
--- a/src/containers/transform/TransformContainer.ts
+++ b/src/containers/transform/TransformContainer.ts
@@ -223,7 +223,7 @@ export class TransformContainer extends Container {
 
   async init(engine: ContainerEngine): Promise<void> {
     await super.init(engine);
-    this.logger = engine.logger.child({ filename: __filename, driveId: this.params.name });
+    this.logger = engine.logger.child({ filename: __filename, driveId: this.params.name, jobId: this.params.jobId });
     this.transformLog = new TransformLog();
     this.logger.add(this.transformLog);
   }
diff --git a/src/utils/logger/DailyRotateFile.ts b/src/utils/logger/DailyRotateFile.ts
index 71fc4501..6382672e 100644
--- a/src/utils/logger/DailyRotateFile.ts
+++ b/src/utils/logger/DailyRotateFile.ts
@@ -9,8 +9,6 @@ import crypto from 'crypto';
 import {DailyRotateFileProcessor} from './DailyRotateFileProcessor';
 import {StreamOptions} from 'stream';
 
-const MESSAGE = 'message';
-
 const loggerDefaults = {
   json: false,
   colorize: false,
@@ -183,10 +181,11 @@ export class DailyRotateFile extends Transport {
   }
 
   log(info, callback) {
-    const logStream = this.getLogStream(info.driveId);
-    // logStream.write(info[MESSAGE] + this.options.eol);
-    logStream.write(JSON.stringify(info) + this.options.eol);
-    this.emit('logged', info);
+    if (!info?.jobId) {
+      const logStream = this.getLogStream(info.driveId);
+      logStream.write(JSON.stringify(info) + this.options.eol);
+      this.emit('logged', info);
+    }
 
     if (callback) {
       callback(null, true);
@@ -214,6 +213,11 @@ export class DailyRotateFile extends Transport {
 
     options = options || {};
 
+    if (options.jobId) {
+      callback(null, []);
+      return [];
+    }
+
     // limit
     options.rows = options.rows || options.limit || 10;
 
diff --git a/src/utils/logger/JobLogFile.ts b/src/utils/logger/JobLogFile.ts
new file mode 100644
index 00000000..d6fe060a
--- /dev/null
+++ b/src/utils/logger/JobLogFile.ts
@@ -0,0 +1,116 @@
+import Transport, {TransportStreamOptions} from 'winston-transport';
+import path from 'path';
+import fs, {ReadStream} from 'fs';
+import {StreamOptions} from 'stream';
+import os from 'os';
+import {JobLogFileProcessor} from './JobLogFileProcessor';
+
+
+interface JobLogStreamOptions extends TransportStreamOptions {
+  file_options?: StreamOptions<ReadStream>;
+  zippedArchive?: boolean;
+  extension?: string;
+  dirname: string;
+  filename: string;
+  eol?: string;
+}
+
+function isValidFileName(filename) {
+  // eslint-disable-next-line no-control-regex
+  return !/["<>|:*?\\/\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f]/g.test(filename);
+}
+
+function isValidDirName(dirname) {
+  // eslint-disable-next-line no-control-regex
+  return !/["<>|\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f]/g.test(dirname);
+}
+
+const loggerDefaults = {
+  eol: os.EOL,
+};
+
+export class JobLogFile extends Transport {
+  name = 'jobLogFile';
+
+  private options: JobLogStreamOptions;
+  private dirname: string;
+  private filename: string;
+
+  constructor(options: JobLogStreamOptions) {
+    super(options);
+
+    this.options = { ...loggerDefaults, ...options };
+
+    this.filename = options.filename;
+    this.dirname = options.dirname;
+
+    if (!isValidFileName(this.filename) || !isValidDirName(this.dirname)) {
+      throw new Error('Your path or filename contain an invalid character.');
+    }
+  }
+
+  log(info, callback) {
+    if (info?.jobId) {
+      const logStream = this.getLogStream(info.driveId, info.jobId);
+      logStream.write(JSON.stringify(info) + this.options.eol);
+      logStream.close();
+      this.emit('logged', info);
+    }
+
+    if (callback) {
+      callback(null, true);
+    }
+  }
+
+  async close() {
+    this.emit('finish');
+  }
+
+  getLogStream(driveId: string, jobId: string) {
+    driveId = driveId || '';
+
+    const dirname = this.dirname
+      .replace('%driveId%', driveId)
+      .replace('%jobId%', jobId)
+      .replace('//', '/');
+
+    const filename = path.join(dirname, this.filename)
+      .replace(/%JOB_ID%/g, jobId);
+    return fs.createWriteStream(filename, this.options.file_options);
+  }
+
+  async query(options, callback) {
+    if (!this.filename) {
+      throw new Error('query() may not be used when initializing with a stream');
+    }
+
+    options = options || {};
+
+    if (!options.jobId || !options.driveId) {
+      callback(null, []);
+      return [];
+    }
+
+    options.order = options.order || 'desc';
+
+    const dirname = this.dirname
+      .replace('%driveId%', options.driveId)
+      .replace('%jobId%', options.jobId)
+      .replace('//', '/');
+
+    const filename = path.join(dirname, this.filename)
+      .replace(/%JOB_ID%/g, options.jobId);
+
+    try {
+      const processor = new JobLogFileProcessor(filename, options);
+      const results = await processor.query();
+      callback(null, results);
+      return results;
+    } catch (err) {
+      callback(err);
+      throw err;
+    }
+  }
+
+}
+
diff --git a/src/utils/logger/JobLogFileProcessor.ts b/src/utils/logger/JobLogFileProcessor.ts
new file mode 100644
index 00000000..0762f1f1
--- /dev/null
+++ b/src/utils/logger/JobLogFileProcessor.ts
@@ -0,0 +1,110 @@
+import fs, {ReadStream} from 'fs';
+import {PassThrough, Readable} from 'stream';
+import zlib from 'zlib';
+import {FileId} from '../../model/model';
+
+interface LogLine {
+  level: 'error' | 'info' | 'debug';
+  message: string;
+  timestamp: number;
+  filename: string;
+  driveId: FileId;
+  jobId: string;
+  payload?: {[key: string]: string | number};
+}
+
+export class JobLogFileProcessor {
+  constructor(private logFile: string, private options) {
+  }
+
+  createReadStream(logFile: string): [ReadStream, Readable] {
+    const readStream = fs.createReadStream(logFile);
+
+    if (logFile.endsWith('.gz')) {
+      const stream = new PassThrough();
+      readStream.pipe(zlib.createGunzip()).pipe(stream);
+      return [readStream, stream];
+    } else {
+      return [readStream, readStream];
+    }
+  }
+
+  stringToLogLine(buff: string) {
+    try {
+      const log: LogLine = JSON.parse(buff);
+      if (!log || typeof log !== 'object') {
+        return null;
+      }
+
+      const time = new Date(log.timestamp);
+      log.timestamp = +time;
+
+      if (this.options.level && this.options.level !== log.level) {
+        return null;
+      }
+
+      return log;
+    } catch (err) {
+      return null;
+    }
+  }
+
+  processLogFile(logFile: string): Promise<LogLine[]> {
+    return new Promise((resolve, reject) => {
+      const results = [];
+      const [readStream, stream] = this.createReadStream(logFile);
+
+      stream.on('error', (err) => {
+        if (stream.readable) {
+          stream.destroy();
+        }
+
+        if (err['code'] === 'ENOENT') {
+          resolve(results);
+        } else {
+          reject(err);
+        }
+      });
+
+      let buff = '';
+      stream.on('data', (data) => {
+        const dataArr = (buff + data).split(/\n+/);
+        const l = dataArr.length - 1;
+
+        for (let i = 0; i < l; i++) {
+          const logLine = this.stringToLogLine(dataArr[i]);
+          if (!logLine) continue;
+
+          results.push(logLine);
+        }
+
+        buff = dataArr[l];
+      });
+
+      stream.on('end', () => {
+        if (buff) {
+          const logLine = this.stringToLogLine(buff);
+          if (!logLine) return;
+
+          results.push(logLine);
+        }
+
+        resolve(results);
+      });
+
+    });
+  }
+
+  async query() {
+    const retVal = [];
+    let results: LogLine[] = await this.processLogFile(this.logFile);
+
+    if (this.options.order === 'desc') {
+      results = results.reverse();
+    }
+
+    retVal.push(...results);
+
+    return retVal;
+  }
+}
diff --git a/src/utils/logger/logger.ts b/src/utils/logger/logger.ts
index 0cb61687..bcd72366 100644
--- a/src/utils/logger/logger.ts
+++ b/src/utils/logger/logger.ts
@@ -4,6 +4,7 @@ import path from 'path';
 import {DailyRotateFile} from './DailyRotateFile';
 import {fileURLToPath} from 'url';
 import {ansi_colors} from './colors';
+import {JobLogFile} from './JobLogFile';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -133,6 +134,12 @@ export function createLogger(eventBus: EventEmitter, workdir: string) {
   }));
 
   const dirname = path.join(workdir, '%driveId%', '.logs');
+  logger.add(new JobLogFile({
+    format: winston.format.json(),
+    zippedArchive: true,
+    dirname: dirname,
+    filename: 'job-%JOB_ID%.log'
+  }));
   logger.add(new DailyRotateFile({
     format: winston.format.json(),
     zippedArchive: true,