diff --git a/client/src/app/+admin/config/edit-custom-config/edit-configuration.service.ts b/client/src/app/+admin/config/edit-custom-config/edit-configuration.service.ts
index 6c431ce64..628c2d102 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-configuration.service.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-configuration.service.ts
@@ -61,6 +61,14 @@ export class EditConfigurationService {
     return form.value['transcoding']['enabled'] === true
   }
 
+  isRemoteRunnerVODEnabled (form: FormGroup) {
+    return form.value['transcoding']['remoteRunners']['enabled'] === true
+  }
+
+  isRemoteRunnerLiveEnabled (form: FormGroup) {
+    return form.value['live']['transcoding']['remoteRunners']['enabled'] === true
+  }
+
   isStudioEnabled (form: FormGroup) {
     return form.value['videoStudio']['enabled'] === true
   }
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html
index 34ce8efa6..e9919741f 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html
@@ -110,10 +110,45 @@
             </my-peertube-checkbox>
           </div>
 
-          <div class="form-group" formGroupName="remoteRunners" [ngClass]="getDisabledLiveTranscodingClass()">
+          <div class="callout callout-light pt-2 mt-2 pb-0">
+            <label i18n>Output formats</label>
+
+            <div class="form-group" [ngClass]="getDisabledLiveTranscodingClass()">
+              <label i18n for="liveTranscodingThreads">Live resolutions to generate</label>
+
+              <div class="ms-2 mt-2 d-flex flex-column">
+
+                <ng-container formGroupName="resolutions">
+                  <div class="form-group" *ngFor="let resolution of liveResolutions">
+                    <my-peertube-checkbox
+                      [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
+                      labelText="{{resolution.label}}"
+                    >
+                      <ng-template *ngIf="resolution.description" ptTemplate="help">
+                        <div [innerHTML]="resolution.description"></div>
+                      </ng-template>
+                    </my-peertube-checkbox>
+                  </div>
+                </ng-container>
+
+                <div class="form-group">
+                  <my-peertube-checkbox
+                    inputName="transcodingAlwaysTranscodeOriginalResolution" formControlName="alwaysTranscodeOriginalResolution"
+                    i18n-labelText labelText="Also transcode original resolution"
+                  >
+                    <ng-container i18n ngProjectAs="description">
+                      Even if it's above your maximum enabled resolution
+                    </ng-container>
+                  </my-peertube-checkbox>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="form-group mt-4" formGroupName="remoteRunners" [ngClass]="getDisabledLiveTranscodingClass()">
             <my-peertube-checkbox
               inputName="transcodingRemoteRunnersEnabled" formControlName="enabled"
-              i18n-labelText labelText="Enable remote runners"
+              i18n-labelText labelText="Enable remote runners for lives"
             >
               <ng-container ngProjectAs="description">
                 <span i18n>
@@ -124,38 +159,7 @@
             </my-peertube-checkbox>
           </div>
 
-          <div class="form-group" [ngClass]="getDisabledLiveTranscodingClass()">
-            <label i18n for="liveTranscodingThreads">Live resolutions to generate</label>
-
-            <div class="ms-2 mt-2 d-flex flex-column">
-
-              <ng-container formGroupName="resolutions">
-                <div class="form-group" *ngFor="let resolution of liveResolutions">
-                  <my-peertube-checkbox
-                    [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
-                    labelText="{{resolution.label}}"
-                  >
-                    <ng-template *ngIf="resolution.description" ptTemplate="help">
-                      <div [innerHTML]="resolution.description"></div>
-                    </ng-template>
-                  </my-peertube-checkbox>
-                </div>
-              </ng-container>
-
-              <div class="form-group">
-                <my-peertube-checkbox
-                  inputName="transcodingAlwaysTranscodeOriginalResolution" formControlName="alwaysTranscodeOriginalResolution"
-                  i18n-labelText labelText="Also transcode original resolution"
-                >
-                  <ng-container i18n ngProjectAs="description">
-                    Even if it's above your maximum enabled resolution
-                  </ng-container>
-                </my-peertube-checkbox>
-              </div>
-            </div>
-          </div>
-
-          <div class="form-group" [ngClass]="getDisabledLiveTranscodingClass()">
+          <div class="form-group" [ngClass]="getDisabledLiveLocalTranscodingClass()">
             <label i18n for="liveTranscodingThreads">Live transcoding threads</label>
 
             <span class="small muted ms-1">
@@ -177,7 +181,7 @@
             <div *ngIf="formErrors.live.transcoding.threads" class="form-error">{{ formErrors.live.transcoding.threads }}</div>
           </div>
 
-          <div class="form-group mt-4" [ngClass]="getDisabledLiveTranscodingClass()">
+          <div class="form-group mt-4" [ngClass]="getDisabledLiveLocalTranscodingClass()">
             <label i18n for="liveTranscodingProfile">Live transcoding profile</label>
             <span class="small muted ms-1" i18n>new live transcoding profiles can be added by PeerTube plugins</span>
 
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts
index d4892a571..50b882cb8 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.ts
@@ -71,6 +71,10 @@ export class EditLiveConfigurationComponent implements OnInit, OnChanges {
     return this.editConfigurationService.isLiveEnabled(this.form)
   }
 
+  isRemoteRunnerLiveEnabled () {
+    return this.editConfigurationService.isRemoteRunnerLiveEnabled(this.form)
+  }
+
   getDisabledLiveClass () {
     return { 'disabled-checkbox-extra': !this.isLiveEnabled() }
   }
@@ -79,6 +83,10 @@ export class EditLiveConfigurationComponent implements OnInit, OnChanges {
     return { 'disabled-checkbox-extra': !this.isLiveEnabled() || !this.isLiveTranscodingEnabled() }
   }
 
+  getDisabledLiveLocalTranscodingClass () {
+    return { 'disabled-checkbox-extra': !this.isLiveEnabled() || !this.isLiveTranscodingEnabled() || this.isRemoteRunnerLiveEnabled() }
+  }
+
   isLiveTranscodingEnabled () {
     return this.editConfigurationService.isLiveTranscodingEnabled(this.form)
   }
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
index b17c51532..d3fc2e481 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
@@ -37,20 +37,6 @@
 
             <ng-container ngProjectAs="extra">
 
-              <div class="form-group" formGroupName="remoteRunners" [ngClass]="getTranscodingDisabledClass()">
-                <my-peertube-checkbox
-                  inputName="transcodingRemoteRunnersEnabled" formControlName="enabled"
-                  i18n-labelText labelText="Enable remote runners"
-                >
-                  <ng-container ngProjectAs="description">
-                    <span i18n>
-                      Use <a routerLink="/admin/system/runners/runners-list">remote runners</a> to process VOD transcoding.
-                      Remote runners has to register on your instance first.
-                    </span>
-                  </ng-container>
-                </my-peertube-checkbox>
-              </div>
-
               <div class="callout callout-light pt-2 pb-0">
                 <label i18n>Input formats</label>
 
@@ -155,7 +141,21 @@
           </my-peertube-checkbox>
         </div>
 
-        <div class="form-group mt-4" [ngClass]="getTranscodingDisabledClass()">
+        <div class="form-group mt-4" formGroupName="remoteRunners" [ngClass]="getTranscodingDisabledClass()">
+          <my-peertube-checkbox
+            inputName="transcodingRemoteRunnersEnabled" formControlName="enabled"
+            i18n-labelText labelText="Enable remote runners for VOD"
+          >
+            <ng-container ngProjectAs="description">
+              <span i18n>
+                Use <a routerLink="/admin/system/runners/runners-list">remote runners</a> to process VOD transcoding.
+                Remote runners has to register on your instance first.
+              </span>
+            </ng-container>
+          </my-peertube-checkbox>
+        </div>
+
+        <div class="form-group mt-4" [ngClass]="getLocalTranscodingDisabledClass()">
           <label i18n for="transcodingThreads">Transcoding threads</label>
 
           <span class="small muted ms-1">
@@ -178,7 +178,7 @@
           <div *ngIf="formErrors.transcoding.threads" class="form-error">{{ formErrors.transcoding.threads }}</div>
         </div>
 
-        <div class="form-group" [ngClass]="getTranscodingDisabledClass()">
+        <div class="form-group" [ngClass]="getLocalTranscodingDisabledClass()">
           <label i18n for="transcodingConcurrency">Transcoding jobs concurrency</label>
           <span class="small muted ms-1" i18n>allows to transcode multiple files in parallel. ⚠️ Requires a PeerTube restart</span>
 
@@ -190,7 +190,7 @@
           <div *ngIf="formErrors.transcoding.concurrency" class="form-error">{{ formErrors.transcoding.concurrency }}</div>
         </div>
 
-        <div class="form-group" [ngClass]="getTranscodingDisabledClass()">
+        <div class="form-group" [ngClass]="getLocalTranscodingDisabledClass()">
           <label i18n for="transcodingProfile">Transcoding profile</label>
           <span class="small muted ms-1" i18n>new transcoding profiles can be added by PeerTube plugins</span>
 
@@ -234,7 +234,7 @@
         <div class="form-group" formGroupName="remoteRunners" [ngClass]="getStudioDisabledClass()">
           <my-peertube-checkbox
             inputName="videoStudioRemoteRunnersEnabled" formControlName="enabled"
-            i18n-labelText labelText="Enable remote runners"
+            i18n-labelText labelText="Enable remote runners for studio"
           >
             <ng-container ngProjectAs="description">
               <span i18n>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
index e960533f9..0a1ebe8e2 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.ts
@@ -58,6 +58,10 @@ export class EditVODTranscodingComponent implements OnInit, OnChanges {
     return 'transcoding.resolutions.' + resolution
   }
 
+  isRemoteRunnerVODEnabled () {
+    return this.editConfigurationService.isRemoteRunnerVODEnabled(this.form)
+  }
+
   isTranscodingEnabled () {
     return this.editConfigurationService.isTranscodingEnabled(this.form)
   }
@@ -70,6 +74,10 @@ export class EditVODTranscodingComponent implements OnInit, OnChanges {
     return { 'disabled-checkbox-extra': !this.isTranscodingEnabled() }
   }
 
+  getLocalTranscodingDisabledClass () {
+    return { 'disabled-checkbox-extra': !this.isTranscodingEnabled() || this.isRemoteRunnerVODEnabled() }
+  }
+
   getStudioDisabledClass () {
     return { 'disabled-checkbox-extra': !this.isStudioEnabled() }
   }
diff --git a/server/tests/api/check-params/upload-quota.ts b/server/tests/api/check-params/upload-quota.ts
index fdc711bd5..008537524 100644
--- a/server/tests/api/check-params/upload-quota.ts
+++ b/server/tests/api/check-params/upload-quota.ts
@@ -39,7 +39,7 @@ describe('Test upload quota', function () {
   describe('When having a video quota', function () {
 
     it('Should fail with a registered user having too many videos with legacy upload', async function () {
-      this.timeout(30000)
+      this.timeout(120000)
 
       const user = { username: 'registered' + randomInt(1, 1500), password: 'password' }
       await server.registrations.register(user)
diff --git a/server/tests/api/check-params/video-comments.ts b/server/tests/api/check-params/video-comments.ts
index 550198844..9f497c0cf 100644
--- a/server/tests/api/check-params/video-comments.ts
+++ b/server/tests/api/check-params/video-comments.ts
@@ -31,7 +31,7 @@ describe('Test video comments API validator', function () {
   // ---------------------------------------------------------------
 
   before(async function () {
-    this.timeout(30000)
+    this.timeout(120000)
 
     server = await createSingleServer(1)
 
diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts
index e35500b0b..b7d5624a6 100644
--- a/server/tests/api/videos/video-comments.ts
+++ b/server/tests/api/videos/video-comments.ts
@@ -24,7 +24,7 @@ describe('Test video comments', function () {
   let command: CommentsCommand
 
   before(async function () {
-    this.timeout(30000)
+    this.timeout(120000)
 
     server = await createSingleServer(1)