diff --git a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
index 588b6864..5dc3b8b6 100644
--- a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
@@ -19,6 +19,8 @@
 
 package de.steamwar.tntleague
 
+import de.steamwar.core.Core
+import de.steamwar.core.WorldIdentifier
 import de.steamwar.message.Message
 import de.steamwar.tntleague.command.*
 import de.steamwar.tntleague.events.GlobalListener
@@ -43,6 +45,11 @@ class TNTLeague : JavaPlugin() {
 
         logger.info("TNTLeague enabled")
 
+        val arenaMap = System.getProperty("arenaMap")
+        if (arenaMap != null) {
+            WorldIdentifier.set("fight/" + Core.getVersion() + "/" + arenaMap)
+        }
+
         ReadyCommand.register()
         InviteCommand.register()
         AcceptCommand.register()
diff --git a/TowerRun/src/de/steamwar/towerrun/TowerRun.java b/TowerRun/src/de/steamwar/towerrun/TowerRun.java
index 10298547..30dd4046 100644
--- a/TowerRun/src/de/steamwar/towerrun/TowerRun.java
+++ b/TowerRun/src/de/steamwar/towerrun/TowerRun.java
@@ -20,6 +20,8 @@
 package de.steamwar.towerrun;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.core.Core;
+import de.steamwar.core.WorldIdentifier;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.linkage.SpigotLinker;
@@ -56,6 +58,11 @@ public class TowerRun extends JavaPlugin {
             towerGenerator = new TowerGenerator(WorldConfig.TOWER_GENERATOR_CONFIG);
         }
 
+        String arenaMap = System.getProperty("arenaMap");
+        if (arenaMap != null) {
+            WorldIdentifier.set("fight/" + Core.getVersion() + "/" + arenaMap);
+        }
+
         SpigotLinker spigotLinker = new SpigotLinker(this, message) {
             @Override
             protected void linkObject(Object any) {
@@ -64,6 +71,7 @@ public class TowerRun extends JavaPlugin {
                 }
             }
         };
+
         try {
             spigotLinker.link();
         } catch (AbstractLinker.LinkException e) {