diff --git a/flake.nix b/flake.nix
index f4ec7d2..6126287 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,8 @@
         };
 
         minecraft = {
-          dir = "/tank/services/minecraft/main";
+          parent_dir = "/tank/services/minecraft";
+          server_name = "main";
         };
 
         gluetun = {
diff --git a/services/minecraft.nix b/services/minecraft.nix
index c456087..03441bc 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -15,9 +15,9 @@
   services.minecraft-servers = {
     enable = true;
     eula = true;
-    dataDir = "/tank/services/minecraft";
+    dataDir = service_configs.minecraft.parent_dir;
     openFirewall = true;
-    servers.main = {
+    servers.${service_configs.minecraft.server_name} = {
       enable = true;
       package = pkgs.fabricServers.fabric-1_21_1;
       jvmOpts = "-Xmx6144M -Xms6144M -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32";