diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index f29e7fe9a..ed0d32187 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -1,74 +1,74 @@
 [supervisord]
 nodaemon=true
-logfile=/tmp/supervisord.log
+logfile=/var/lib/server/logs/supervisord.log
 
 [program:syncing-server]
-directory=/opt/bundled/syncing-server
-command=yarn workspace @standardnotes/syncing-server supervisor:start
+directory=/opt/bundled/syncing-server/packages/syncing-server
+command=/opt/bundled/syncing-server/packages/syncing-server/supervisor/supervisor-server.sh
 autostart=true
 autorestart=true
 stdout_logfile=/var/lib/server/logs/syncing-server.log
 stderr_logfile=/var/lib/server/logs/syncing-server.err
 
 [program:syncing-server-worker]
-directory=/opt/bundled/syncing-server
-command=yarn workspace @standardnotes/syncing-server supervisor:worker
+directory=/opt/bundled/syncing-server/packages/syncing-server
+command=/opt/bundled/syncing-server/packages/syncing-server/supervisor/supervisor-worker.sh
 autostart=true
 autorestart=true
 stdout_logfile=/var/lib/server/logs/syncing-server-worker.log
 stderr_logfile=/var/lib/server/logs/syncing-server-worker.err
 
 [program:auth]
-directory=/opt/bundled/auth
-command=yarn workspace @standardnotes/auth-server supervisor:start
+directory=/opt/bundled/auth/packages/auth
+command=/opt/bundled/auth/packages/auth/supervisor/supervisor-server.sh
 autostart=true
 autorestart=true
 stdout_logfile=/var/lib/server/logs/auth.log
 stderr_logfile=/var/lib/server/logs/auth.err
 
 [program:auth-worker]
-directory=/opt/bundled/auth
-command=yarn workspace @standardnotes/auth-server supervisor:worker
+directory=/opt/bundled/auth/packages/auth
+command=/opt/bundled/auth/packages/auth/supervisor/supervisor-worker.sh
 autostart=true
 autorestart=true
 stdout_logfile=/var/lib/server/logs/auth-worker.log
 stderr_logfile=/var/lib/server/logs/auth-worker.err
 
 [program:files]
-directory=/opt/bundled/files
-command=yarn workspace @standardnotes/files-server supervisor:start
+directory=/opt/bundled/files/packages/files
+command=/opt/bundled/files/packages/files/supervisor/supervisor-server.sh
 autostart=true
 autorestart=true
 stdout_logfile=/var/lib/server/logs/files.log
 stderr_logfile=/var/lib/server/logs/files.err
 
 [program:files-worker]
-directory=/opt/bundled/files
-command=yarn workspace @standardnotes/files-server supervisor:worker
+directory=/opt/bundled/files/packages/files
+command=/opt/bundled/files/packages/files/supervisor/supervisor-worker.sh
 autostart=true
 autorestart=true
 stdout_logfile=/var/lib/server/logs/files-worker.log
 stderr_logfile=/var/lib/server/logs/files-worker.err
 
 [program:revisions]
-directory=/opt/bundled/revisions
-command=yarn workspace @standardnotes/revisions-server supervisor:start
+directory=/opt/bundled/revisions/packages/revisions
+command=/opt/bundled/revisions/packages/revisions/supervisor/supervisor-server.sh
 autostart=true
 autorestart=true
 stdout_logfile=/var/lib/server/logs/revisions.log
 stderr_logfile=/var/lib/server/logs/revisions.err
 
 [program:revisions-worker]
-directory=/opt/bundled/revisions
-command=yarn workspace @standardnotes/revisions-server supervisor:worker
+directory=/opt/bundled/revisions/packages/revisions
+command=/opt/bundled/revisions/packages/revisions/supervisor/supervisor-worker.sh
 autostart=true
 autorestart=true
 stdout_logfile=/var/lib/server/logs/revisions-worker.log
 stderr_logfile=/var/lib/server/logs/revisions-worker.err
 
 [program:api-gateway]
-directory=/opt/bundled/api-gateway
-command=yarn workspace @standardnotes/api-gateway supervisor:start
+directory=/opt/bundled/api-gateway/packages/api-gateway
+command=/opt/bundled/api-gateway/packages/api-gateway/supervisor/supervisor-server.sh
 autostart=true
 autorestart=true
 stdout_logfile=/var/lib/server/logs/api-gateway.log
diff --git a/packages/api-gateway/supervisor/entrypoint-server.js b/packages/api-gateway/supervisor/entrypoint-server.js
new file mode 100644
index 000000000..a59fe3a6d
--- /dev/null
+++ b/packages/api-gateway/supervisor/entrypoint-server.js
@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/server.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index
diff --git a/packages/api-gateway/supervisor/supervisor-server.sh b/packages/api-gateway/supervisor/supervisor-server.sh
new file mode 100755
index 000000000..8fa6de578
--- /dev/null
+++ b/packages/api-gateway/supervisor/supervisor-server.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
+node supervisor/entrypoint-server.js
diff --git a/packages/api-gateway/docker/wait-for.sh b/packages/api-gateway/supervisor/wait-for.sh
similarity index 100%
rename from packages/api-gateway/docker/wait-for.sh
rename to packages/api-gateway/supervisor/wait-for.sh
diff --git a/packages/auth/supervisor/entrypoint-server.js b/packages/auth/supervisor/entrypoint-server.js
new file mode 100644
index 000000000..a59fe3a6d
--- /dev/null
+++ b/packages/auth/supervisor/entrypoint-server.js
@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/server.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index
diff --git a/packages/auth/supervisor/entrypoint-worker.js b/packages/auth/supervisor/entrypoint-worker.js
new file mode 100644
index 000000000..daf3cf9da
--- /dev/null
+++ b/packages/auth/supervisor/entrypoint-worker.js
@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/worker.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index
diff --git a/packages/auth/supervisor/supervisor-server.sh b/packages/auth/supervisor/supervisor-server.sh
new file mode 100755
index 000000000..8fa6de578
--- /dev/null
+++ b/packages/auth/supervisor/supervisor-server.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
+node supervisor/entrypoint-server.js
diff --git a/packages/auth/supervisor/supervisor-worker.sh b/packages/auth/supervisor/supervisor-worker.sh
new file mode 100755
index 000000000..eff79439a
--- /dev/null
+++ b/packages/auth/supervisor/supervisor-worker.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh localhost $AUTH_SERVER_PORT
+node supervisor/entrypoint-worker.js
diff --git a/packages/auth/docker/wait-for.sh b/packages/auth/supervisor/wait-for.sh
similarity index 100%
rename from packages/auth/docker/wait-for.sh
rename to packages/auth/supervisor/wait-for.sh
diff --git a/packages/files/supervisor/entrypoint-server.js b/packages/files/supervisor/entrypoint-server.js
new file mode 100644
index 000000000..a59fe3a6d
--- /dev/null
+++ b/packages/files/supervisor/entrypoint-server.js
@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/server.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index
diff --git a/packages/files/supervisor/entrypoint-worker.js b/packages/files/supervisor/entrypoint-worker.js
new file mode 100644
index 000000000..daf3cf9da
--- /dev/null
+++ b/packages/files/supervisor/entrypoint-worker.js
@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/worker.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index
diff --git a/packages/files/supervisor/supervisor-server.sh b/packages/files/supervisor/supervisor-server.sh
new file mode 100755
index 000000000..f70e06e9d
--- /dev/null
+++ b/packages/files/supervisor/supervisor-server.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh $DB_HOST $DB_PORT
+sh supervisor/wait-for.sh $REDIS_HOST $REDIS_PORT
+node supervisor/entrypoint-server.js
diff --git a/packages/files/supervisor/supervisor-worker.sh b/packages/files/supervisor/supervisor-worker.sh
new file mode 100755
index 000000000..3fd9bad2c
--- /dev/null
+++ b/packages/files/supervisor/supervisor-worker.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
+node supervisor/entrypoint-worker.js
diff --git a/packages/files/docker/wait-for.sh b/packages/files/supervisor/wait-for.sh
similarity index 100%
rename from packages/files/docker/wait-for.sh
rename to packages/files/supervisor/wait-for.sh
diff --git a/packages/revisions/supervisor/entrypoint-server.js b/packages/revisions/supervisor/entrypoint-server.js
new file mode 100644
index 000000000..a59fe3a6d
--- /dev/null
+++ b/packages/revisions/supervisor/entrypoint-server.js
@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/server.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index
diff --git a/packages/revisions/supervisor/entrypoint-worker.js b/packages/revisions/supervisor/entrypoint-worker.js
new file mode 100644
index 000000000..daf3cf9da
--- /dev/null
+++ b/packages/revisions/supervisor/entrypoint-worker.js
@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/worker.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index
diff --git a/packages/revisions/supervisor/supervisor-server.sh b/packages/revisions/supervisor/supervisor-server.sh
new file mode 100755
index 000000000..f70e06e9d
--- /dev/null
+++ b/packages/revisions/supervisor/supervisor-server.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh $DB_HOST $DB_PORT
+sh supervisor/wait-for.sh $REDIS_HOST $REDIS_PORT
+node supervisor/entrypoint-server.js
diff --git a/packages/revisions/supervisor/supervisor-worker.sh b/packages/revisions/supervisor/supervisor-worker.sh
new file mode 100755
index 000000000..3fd9bad2c
--- /dev/null
+++ b/packages/revisions/supervisor/supervisor-worker.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
+node supervisor/entrypoint-worker.js
diff --git a/packages/revisions/docker/wait-for.sh b/packages/revisions/supervisor/wait-for.sh
similarity index 100%
rename from packages/revisions/docker/wait-for.sh
rename to packages/revisions/supervisor/wait-for.sh
diff --git a/packages/syncing-server/supervisor/entrypoint-server.js b/packages/syncing-server/supervisor/entrypoint-server.js
new file mode 100644
index 000000000..a59fe3a6d
--- /dev/null
+++ b/packages/syncing-server/supervisor/entrypoint-server.js
@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/server.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index
diff --git a/packages/syncing-server/supervisor/entrypoint-worker.js b/packages/syncing-server/supervisor/entrypoint-worker.js
new file mode 100644
index 000000000..daf3cf9da
--- /dev/null
+++ b/packages/syncing-server/supervisor/entrypoint-worker.js
@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/worker.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index
diff --git a/packages/syncing-server/supervisor/supervisor-server.sh b/packages/syncing-server/supervisor/supervisor-server.sh
new file mode 100755
index 000000000..f70e06e9d
--- /dev/null
+++ b/packages/syncing-server/supervisor/supervisor-server.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh $DB_HOST $DB_PORT
+sh supervisor/wait-for.sh $REDIS_HOST $REDIS_PORT
+node supervisor/entrypoint-server.js
diff --git a/packages/syncing-server/supervisor/supervisor-worker.sh b/packages/syncing-server/supervisor/supervisor-worker.sh
new file mode 100755
index 000000000..3fd9bad2c
--- /dev/null
+++ b/packages/syncing-server/supervisor/supervisor-worker.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
+node supervisor/entrypoint-worker.js
diff --git a/packages/syncing-server/docker/wait-for.sh b/packages/syncing-server/supervisor/wait-for.sh
similarity index 100%
rename from packages/syncing-server/docker/wait-for.sh
rename to packages/syncing-server/supervisor/wait-for.sh