diff --git a/docker-compose.yml b/docker-compose.yml
index fb92912051b..d23ef4c613b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@
 version: '3.7'
 services:
   mediawiki:
-    image: docker-registry.wikimedia.org/dev/stretch-php72-fpm-apache2-xdebug:0.3.0
+    image: docker-registry.wikimedia.org/dev/stretch-php72-fpm-apache2-xdebug:0.4.0
     ports:
       - "${MW_DOCKER_PORT:-8080}:8080"
     volumes:
@@ -24,3 +24,10 @@ services:
       MW_SITENAME: 'MediaWiki'
       MW_LOG_DIR: /var/www/html/cache
       XDEBUG_CONFIG: ${XDEBUG_CONFIG}
+  mediawiki-jobrunner:
+    image: docker-registry.wikimedia.org/dev/stretch-php72-jobrunner:0.0.1
+    volumes:
+      - ./:/var/www/html:cached
+    environment:
+      MW_LOG_DIR: /var/www/html/cache
+      MW_INSTALL_PATH: /var/www/html
diff --git a/includes/DevelopmentSettings.php b/includes/DevelopmentSettings.php
index 27aea59205e..c3825dbe50a 100644
--- a/includes/DevelopmentSettings.php
+++ b/includes/DevelopmentSettings.php
@@ -69,17 +69,6 @@ $wgEnableJavaScriptTest = true;
 // Enable development/experimental endpoints
 $wgRestAPIAdditionalRouteFiles = [ 'includes/Rest/coreDevelopmentRoutes.json' ];
 
-// Disable resource limits
-$wgMaxShellMemory = 0;
-$wgMaxShellFileSize = 0;
-$wgMaxShellTime = 0;
-$wgMaxShellWallClockTime = 0;
-
-// Disable resource limits for TimedMediaHandler
-$wgTranscodeBackgroundTimeLimit = 0;
-$wgTranscodeBackgroundMemoryLimit = 0;
-$wgTranscodeBackgroundSizeLimit = 0;
-
 /**
  * Experimental changes that may later become the default.
  * (Must reference a Phabricator ticket)