diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts
index cdd5d7205..5963148c8 100644
--- a/src/core/configuration/DefaultConfig.ts
+++ b/src/core/configuration/DefaultConfig.ts
@@ -140,7 +140,7 @@ export abstract class DefaultServerConfig implements ServerConfig {
     return 100;
   }
   gameCreationRate(): number {
-    return 60 * 1000;
+    return 120 * 1000;
   }
 
   lobbyMaxPlayers(map: GameMapType, mode: GameMode): number {
diff --git a/src/core/game/TeamAssignment.ts b/src/core/game/TeamAssignment.ts
index 8cd09f9b6..e77e83716 100644
--- a/src/core/game/TeamAssignment.ts
+++ b/src/core/game/TeamAssignment.ts
@@ -23,7 +23,8 @@ export function assignTeams(
     }
   }
 
-  const maxTeamSize = Math.ceil(players.length / teams.length);
+  // ONLY FOR TESTING REMOVE LATER
+  const maxTeamSize = 10; //Math.ceil(players.length / teams.length);
 
   // Sort clans by size (largest first)
   const sortedClans = Array.from(clanGroups.entries()).sort(
diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts
index dfec2aa3c..c961ce389 100644
--- a/src/server/MapPlaylist.ts
+++ b/src/server/MapPlaylist.ts
@@ -90,22 +90,10 @@ export class MapPlaylist {
 
     const rand = new PseudoRandom(Date.now());
 
-    const ffa1: GameMapType[] = rand.shuffleArray([...maps]);
-    const ffa2: GameMapType[] = rand.shuffleArray([...maps]);
-    const ffa3: GameMapType[] = rand.shuffleArray([...maps]);
     const team: GameMapType[] = rand.shuffleArray([...maps]);
 
     this.mapsPlaylist = [];
     for (let i = 0; i < maps.length; i++) {
-      if (!this.addNextMap(this.mapsPlaylist, ffa1, GameMode.FFA)) {
-        return false;
-      }
-      if (!this.addNextMap(this.mapsPlaylist, ffa2, GameMode.FFA)) {
-        return false;
-      }
-      if (!this.addNextMap(this.mapsPlaylist, ffa3, GameMode.FFA)) {
-        return false;
-      }
       if (!this.addNextMap(this.mapsPlaylist, team, GameMode.Team)) {
         return false;
       }