diff --git a/docker-tmserver/.entrypoint-tmserver.sh.swp b/docker-tmserver/.entrypoint-tmserver.sh.swp
deleted file mode 100644
index 9d62005..0000000
Binary files a/docker-tmserver/.entrypoint-tmserver.sh.swp and /dev/null differ
diff --git a/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/.playlist.txt.swp b/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/.playlist.txt.swp
deleted file mode 100644
index 4f9a725..0000000
Binary files a/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/.playlist.txt.swp and /dev/null differ
diff --git a/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/_playlist.txt b/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/_playlist.txt
index f265cec..6c7c345 100644
--- a/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/_playlist.txt
+++ b/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/_playlist.txt
@@ -4,7 +4,7 @@
 		<game_mode>$GAMEMODE</game_mode>
 		<chat_time>$CHATTIME</chat_time>
 		<finishtimeout>$FINISHTIMEOUT</finishtimeout>
-		<allwarmupduration>$WARMUPDURATION</allwarmupduration>
+		<allwarmupduration>0</allwarmupduration>
 		<disablerespawn>$DISABLERESPAWN</disablerespawn>
 		<forceshowallopponents>0</forceshowallopponents>
 		<rounds_pointslimit>$ROUNDS_POINTSLIMIT</rounds_pointslimit>
@@ -19,10 +19,10 @@
 		<timeattack_synchstartperiod>0</timeattack_synchstartperiod>
 		<laps_nblaps>$LAPS_NBLAPS</laps_nblaps>
 		<laps_timelimit>$LAPS_TIMELIMIT</laps_timelimit>
-		<cup_pointslimit>$CUP_POINTSLIMIT</cup_pointslimit>
-		<cup_roundsperchallenge>$CUP_ROUNDSPERCHALLENGE</cup_roundsperchallenge>
-		<cup_nbwinners>$CUP_NBWINNERS</cup_nbwinners>
-		<cup_warmupduration>$CUP_WARMUPDURATION</cup_warmupduration>
+		<cup_pointslimit>100</cup_pointslimit>
+		<cup_roundsperchallenge>5</cup_roundsperchallenge>
+		<cup_nbwinners>3</cup_nbwinners>
+		<cup_warmupduration>2</cup_warmupduration>
 	</gameinfos>
 
 	<filter>
diff --git a/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/playlist.txt b/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/playlist.txt
deleted file mode 100644
index c1e9636..0000000
--- a/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/playlist.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<playlist>
-	<gameinfos>
-		<game_mode>1</game_mode>
-		<chat_time>10000</chat_time>
-		<finishtimeout>1</finishtimeout>
-		<allwarmupduration>0</allwarmupduration>
-		<disablerespawn>0</disablerespawn>
-		<forceshowallopponents>0</forceshowallopponents>
-		<rounds_pointslimit>30</rounds_pointslimit>
-		<rounds_usenewrules>0</rounds_usenewrules>
-		<rounds_forcedlaps>0</rounds_forcedlaps>
-		<rounds_pointslimitnewrules>5</rounds_pointslimitnewrules>
-		<team_pointslimit>50</team_pointslimit>
-		<team_maxpoints>6</team_maxpoints>
-		<team_usenewrules>0</team_usenewrules>
-		<team_pointslimitnewrules>5</team_pointslimitnewrules>
-		<timeattack_limit>180000</timeattack_limit>
-		<timeattack_synchstartperiod>0</timeattack_synchstartperiod>
-		<laps_nblaps>5</laps_nblaps>
-		<laps_timelimit>0</laps_timelimit>
-		<cup_pointslimit>100</cup_pointslimit>
-		<cup_roundsperchallenge>5</cup_roundsperchallenge>
-		<cup_nbwinners>3</cup_nbwinners>
-		<cup_warmupduration>2</cup_warmupduration>
-	</gameinfos>
-
-	<hotseat>
-		<game_mode>0</game_mode>
-		<time_limit>300000</time_limit>
-		<rounds_count>5</rounds_count>
-	</hotseat>
-
-	<filter>
-		<is_lan>0</is_lan>
-		<is_internet>1</is_internet>
-		<is_solo>0</is_solo>
-		<is_hotseat>0</is_hotseat>
-		<sort_index>7</sort_index>
-		<random_map_order>0</random_map_order>
-		<force_default_gamemode>0</force_default_gamemode>
-	</filter>
-
-	<startindex>0</startindex>
-	<challenge>
-		<file>Campaigns\Nations\White\A01-Race.Challenge.Gbx</file>
-	</challenge>
-</playlist>