diff --git a/Dockerfile b/Dockerfile
index 8aada5e..eba04ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,8 @@ RUN chown -R openproject:openproject /etc/nginx/sites-available &&\
     ln -s ../sites-available/openproject.conf
 
 # Add supervisord configs
-ADD supervisord/rails.conf /etc/supervisor/conf.d/
-ADD supervisord/nginx.conf /etc/supervisor/conf.d/
+ADD supervisord/rails.conf       /etc/supervisor/conf.d/
+ADD supervisord/nginx.conf       /etc/supervisor/conf.d/
+ADD supervisord/delayed_job.conf /etc/supervisor/conf.d/
 
-CMD ["/var/www/openproject/docker/scripts/run_rails.sh"]
+CMD ["/var/www/openproject/docker/scripts/start_application.sh"]
diff --git a/Vagrantfile b/Vagrantfile
index ad6ce54..240f44b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -34,18 +34,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     openproject.vm.provider 'docker' do |d|
       d.image = 'abevoelker/openproject'
       d.name  = 'openproject'
-      d.cmd   = ['/var/www/openproject/docker/scripts/run_rails.sh']
-
-      d.link('openproject_postgres:postgres')
-      d.link('openproject_memcached:memcached')
-    end
-  end
-
-  config.vm.define "openproject_delayed_job" do |openproject|
-    openproject.vm.provider 'docker' do |d|
-      d.image = 'abevoelker/openproject'
-      d.name  = 'openproject_delayed_job'
-      d.cmd   = ['/var/www/openproject/docker/scripts/run_background_job.sh']
+      d.cmd   = ['/var/www/openproject/docker/scripts/start_application.sh']
 
       d.link('openproject_postgres:postgres')
       d.link('openproject_memcached:memcached')
diff --git a/scripts/run_background_job.sh b/scripts/run_background_job.sh
deleted file mode 100644
index 2bf0530..0000000
--- a/scripts/run_background_job.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-cd /var/www/openproject &&\
-  exec su openproject -c "/var/www/openproject/docker/scripts/env.sh bundle exec script/delayed_job run --exit-on-complete"
diff --git a/scripts/run_rails.sh b/scripts/start_application.sh
similarity index 89%
rename from scripts/run_rails.sh
rename to scripts/start_application.sh
index e236eac..2ada0a3 100644
--- a/scripts/run_rails.sh
+++ b/scripts/start_application.sh
@@ -7,5 +7,5 @@ if [ ! -f /var/www/openproject/.setup-complete ]; then
   echo -e "\nSetup complete!\n"
 fi
 
-echo -e "\nBooting Rails application..."
+echo -e "\nBooting application..."
 /usr/bin/supervisord -c /etc/supervisor/supervisord.conf -n
diff --git a/supervisord/delayed_job.conf b/supervisord/delayed_job.conf
new file mode 100644
index 0000000..0575678
--- /dev/null
+++ b/supervisord/delayed_job.conf
@@ -0,0 +1,5 @@
+[program:rails]
+user=openproject
+directory=/var/www/openproject
+command=/var/www/openproject/docker/scripts/env.sh bundle exec script/delayed_job run --exit-on-complete
+autorestart=true
diff --git a/supervisord/rails.conf b/supervisord/rails.conf
index 20ebaae..216acba 100644
--- a/supervisord/rails.conf
+++ b/supervisord/rails.conf
@@ -2,5 +2,4 @@
 user=openproject
 directory=/var/www/openproject
 command=/var/www/openproject/docker/scripts/env.sh bundle exec puma -b unix:///var/www/openproject/tmp/puma.sock
-redirect_stderr=true
 autorestart=true