diff --git a/spectator/client/docker-compose.yaml.j2 b/spectator/client/docker-compose.yaml.j2
index 8e1b1b2..d88a53f 100644
--- a/spectator/client/docker-compose.yaml.j2
+++ b/spectator/client/docker-compose.yaml.j2
@@ -4,11 +4,8 @@ services:
     image: ghcr.io/opensource-deadlock-tools/devlock/spectator/client:latest
     build: .
     restart: always
+    env_file: ../../.env
     environment:
-      RABBITMQ_HOST:
-      RABBITMQ_PORT:
-      RABBITMQ_USER:
-      RABBITMQ_PASS:
       STEAM_USERNAME: {{ acct.username }}
       STEAM_PASSWORD: {{ acct.password }}
   {% endfor %}
diff --git a/spectator/server/DeadlockSpectatorServer/Program.cs b/spectator/server/DeadlockSpectatorServer/Program.cs
index ca507d1..b276dcb 100644
--- a/spectator/server/DeadlockSpectatorServer/Program.cs
+++ b/spectator/server/DeadlockSpectatorServer/Program.cs
@@ -35,8 +35,8 @@ private static void Main(string[] args)
 
         rmq_host = Environment.GetEnvironmentVariable("RABBITMQ_HOST") ?? "rabbitmq";
         rmq_port = int.Parse(Environment.GetEnvironmentVariable("RABBITMQ_PORT") ?? "5672");
-        rmq_user = Environment.GetEnvironmentVariable("RABBITMQ_DEFAULT_USER") ?? "guest";
-        rmq_pass = Environment.GetEnvironmentVariable("RABBITMQ_DEFAULT_PASS") ?? "guest";
+        rmq_user = Environment.GetEnvironmentVariable("RABBITMQ_ADMIN_USER") ?? "guest";
+        rmq_pass = Environment.GetEnvironmentVariable("RABBITMQ_ADMIN_PASS") ?? "guest";
 
         // Login to Steam
         client = new DeadlockClient(steam_user, steam_pass);
@@ -92,7 +92,6 @@ private static void UpdateQueue(object? source, ElapsedEventArgs e)
         // Use LINQ to filter, calculate and sort matches by priority
         var sortedMatches = matches?
             .Where(match => match.spectators == 0) // Only take matches with no current spectators
-            .Where(match => match.match_score > 500) // No low elo matches allowed
             .Select(match => new
             {
                 Match = match,