diff --git a/Vagrantfile b/Vagrantfile
index 769d5da5..1c461a41 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -28,6 +28,8 @@ $script = <<SCRIPT
         rpm-build \
         swig \
         systemd-devel
+    mkdir /usr/share/fedmsg
+    chown fedmsg:fedmsg /usr/share/fedmsg
     systemctl enable fedmsg-relay
     systemctl start fedmsg-relay
     mkdir /etc/module-build-service/
diff --git a/client_secrets.json b/conf/client_secrets.json
similarity index 100%
rename from client_secrets.json
rename to conf/client_secrets.json
diff --git a/conf/config.py b/conf/config.py
index 30f4b161..f77076c5 100644
--- a/conf/config.py
+++ b/conf/config.py
@@ -119,7 +119,7 @@ class DevConfiguration(BaseConfiguration):
     KOJI_ARCHES = ['x86_64']
     KOJI_REPOSITORY_URL = 'http://kojipkgs.stg.fedoraproject.org/repos'
 
-    OIDC_CLIENT_SECRETS = "client_secrets.json"
+    OIDC_CLIENT_SECRETS = path.join(confdir, 'client_secrets.json')
 
     SSL_CERTIFICATE_FILE = path.join(confdir, 'server.crt')
     SSL_CERTIFICATE_KEY_FILE = path.join(confdir, 'server.key')
diff --git a/conf/mbs-scheduler.service b/conf/mbs-scheduler.service
deleted file mode 100644
index 1ba57ab6..00000000
--- a/conf/mbs-scheduler.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Scheduler for the Module Build Service
-After=network.target
-Documentation=https://pagure.io/fm-orchestrator
-
-[Service]
-ExecStart=/usr/bin/mbs-daemon
-Type=simple
-User=fedmsg
-Group=fedmsg
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst
index 4b10542c..f999bf1c 100644
--- a/docs/CONTRIBUTING.rst
+++ b/docs/CONTRIBUTING.rst
@@ -73,9 +73,9 @@ To start the frontend manually, run the following inside the guest::
 
     $ mbs-frontend
 
-To start the scheduler manually, run the following inside the guest::
+To start the scheduler manually, run the following at `/tmp/module_build_service` inside the guest::
 
-    $ mbs-daemon
+    $ fedmsg-hub
 
 Alternatively, you can restart the Vagrant guest, which inherently starts/restarts the frontend and the scheduler with::