diff --git a/dockerfiles/SynapseWorkers.Dockerfile b/dockerfiles/SynapseWorkers.Dockerfile
index be07fc9d..56cc41d9 100644
--- a/dockerfiles/SynapseWorkers.Dockerfile
+++ b/dockerfiles/SynapseWorkers.Dockerfile
@@ -1,6 +1,6 @@
 # This dockerfile builds on top of Dockerfile-worker and includes a built-in postgres instance
 # as well as sets up the homeserver so that it is ready for testing via Complement
-FROM matrixdotorg/synapse:workers
+FROM matrixdotorg/synapse-workers
 
 # Download a caddy server to stand in front of nginx and terminate TLS using Complement's
 # custom CA.
@@ -46,8 +46,21 @@ ENTRYPOINT \
   SYNAPSE_REPORT_STATS=no \
   # Set postgres authentication details which will be placed in the homeserver config file
   POSTGRES_PASSWORD=somesecret POSTGRES_USER=postgres POSTGRES_HOST=localhost \
-  # Use all available worker types
-  SYNAPSE_WORKERS=* \
+  # Specify the workers to test with
+  SYNAPSE_WORKER_TYPES="\
+    event_persister, \
+    event_persister, \
+    background_worker, \
+    frontend_proxy, \
+    event_creator, \
+    user_dir, \
+    media_repository, \
+    federation_inbound, \
+    federation_reader, \
+    federation_sender, \
+    synchrotron, \
+    appservice, \
+    pusher" \
   # Run the script that writes the necessary config files and starts supervisord, which in turn
   # starts everything else
   /configure_workers_and_start.py