diff --git oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
index df7c0d0..067de59 100644
--- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
@@ -793,7 +793,8 @@ public class DocumentNodeStoreService {
             }
         };
         registrations.add(WhiteboardUtils.scheduleWithFixedDelay(whiteboard,
-                recoverJob, TimeUnit.MILLISECONDS.toSeconds(leaseTime)));
+                recoverJob, TimeUnit.MILLISECONDS.toSeconds(leaseTime),
+                false/*runOnSingleClusterNode*/, true /*use dedicated pool*/));
     }
 
     private void registerJournalGC(final DocumentNodeStore nodeStore) {
@@ -813,7 +814,8 @@ public class DocumentNodeStoreService {
 
         };
         registrations.add(WhiteboardUtils.scheduleWithFixedDelay(whiteboard,
-                journalGCJob, TimeUnit.MILLISECONDS.toSeconds(journalGCInterval), true/*runOnSingleClusterNode*/));
+                journalGCJob, TimeUnit.MILLISECONDS.toSeconds(journalGCInterval),
+                true/*runOnSingleClusterNode*/, true /*use dedicated pool*/));
     }
 
     private Object prop(String propName) {
diff --git oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java
index 640f2f9..0064120 100644
--- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java
@@ -39,12 +39,11 @@ public class IndexMBeanRegistration implements Registration {
 
     public void registerAsyncIndexer(AsyncIndexUpdate task, long delayInSeconds) {
         task.setIndexMBeanRegistration(this);
-        regs.add(scheduleWithFixedDelay(whiteboard, task, delayInSeconds, true));
+        regs.add(scheduleWithFixedDelay(whiteboard, task, delayInSeconds, true, true));
         regs.add(registerMBean(whiteboard, IndexStatsMBean.class,
                 task.getIndexStats(), IndexStatsMBean.TYPE, task.getName()));
         // Register AsyncIndexStats for execution stats update
-        regs.add(scheduleWithFixedDelay(whiteboard, task.getIndexStats(), 1,
-                false));
+        regs.add(scheduleWithFixedDelay(whiteboard, task.getIndexStats(), 1));
     }
 
     @Override
diff --git oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java
index ab6d624..1e61932 100644
--- oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtils.java
@@ -47,11 +47,12 @@ public class WhiteboardUtils {
 
     public static Registration scheduleWithFixedDelay(
             Whiteboard whiteboard, Runnable runnable, long delayInSeconds) {
-        return scheduleWithFixedDelay(whiteboard, runnable, delayInSeconds, false);
+        return scheduleWithFixedDelay(whiteboard, runnable, delayInSeconds, false, false);
     }
 
     public static Registration scheduleWithFixedDelay(
-            Whiteboard whiteboard, Runnable runnable, long delayInSeconds, boolean runOnSingleClusterNode) {
+            Whiteboard whiteboard, Runnable runnable, long delayInSeconds, boolean runOnSingleClusterNode,
+            boolean useDedicatedPool) {
         ImmutableMap.Builder<String, Object> builder = ImmutableMap.<String, Object>builder()
                 .put("scheduler.period", delayInSeconds)
                 .put("scheduler.concurrent", false);
@@ -59,6 +60,10 @@ public class WhiteboardUtils {
             //Make use of feature while running in Sling SLING-2979
             builder.put("scheduler.runOn", "SINGLE");
         }
+        if (useDedicatedPool) {
+            //Make use of dedicated threadpool SLING-5831
+            builder.put("scheduler.threadPool", "oak");
+        }
         return whiteboard.register(
                 Runnable.class, runnable, builder.build());
     }
diff --git oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java
index bde9524..b3f1405 100644
--- oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUtilsTest.java
@@ -21,6 +21,8 @@ package org.apache.jackrabbit.oak.spi.whiteboard;
 
 import java.lang.management.ManagementFactory;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
@@ -32,7 +34,9 @@ import org.apache.jackrabbit.oak.query.QueryEngineSettings;
 import org.junit.After;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 public class WhiteboardUtilsTest {
     private List<Registration> regs = Lists.newArrayList();
@@ -85,6 +89,26 @@ public class WhiteboardUtilsTest {
         assertNotNull(server.getObjectInstance(new ObjectName("org.apache.jackrabbit.oak:type=query,name=settings")));
     }
 
+    @Test
+    public void scheduledJobWithPoolName() throws Exception{
+        final AtomicReference<Map<?, ?>> props = new AtomicReference<Map<?, ?>>();
+        Whiteboard wb = new DefaultWhiteboard(){
+            @Override
+            public <T> Registration register(Class<T> type, T service, Map<?, ?> properties) {
+                props.set(properties);
+                return super.register(type, service, properties);
+            }
+        };
+
+        WhiteboardUtils.scheduleWithFixedDelay(wb, new TestRunnable(), 1, false, true);
+        assertNotNull(props.get().get("scheduler.threadPool"));
+
+        props.set(null);
+        WhiteboardUtils.scheduleWithFixedDelay(wb, new TestRunnable(), 1, true, false);
+        assertNull(props.get().get("scheduler.threadPool"));
+        assertEquals("SINGLE", props.get().get("scheduler.runOn"));
+    }
+
     public interface HelloMBean {
         boolean isRunning();
         int getCount();
@@ -108,4 +132,11 @@ public class WhiteboardUtilsTest {
     private static class HelloTest extends Hello {
 
     }
+
+    private static class TestRunnable implements Runnable {
+        @Override
+        public void run() {
+
+        }
+    }
 }
