diff --git a/modules/services/minecraft-server/minecraft-server.nix b/modules/services/minecraft-server/minecraft-server.nix
index b2016d5..a9b9209 100644
--- a/modules/services/minecraft-server/minecraft-server.nix
+++ b/modules/services/minecraft-server/minecraft-server.nix
@@ -36,7 +36,7 @@
 
         servers.bmc3 = lib.optionalAttrs cfg.enable {
           enable = true;
-          autoStart = true;
+          autoStart = false;
           package = pkgs."${loader}Servers".${serverVersion}.override {inherit loaderVersion;};
           jvmOpts = modpack.variables.JAVA_ARGS;
           symlinks = {
@@ -45,6 +45,17 @@
           serverProperties = {
             motd = "Woher kommt der Stein?";
             white-list = true;
+            server-port = 25566;
+          };
+        };
+        servers.vanilla = lib.optionalAttrs cfg.enable {
+          enable = true;
+          autoStart = false;
+          package = pkgs.minecraftServers.vanilla-1_21;
+          serverProperties = {
+            motd = "Woher kommt der Stein?";
+            white-list = true;
+            server-port = 25565;
           };
         };
       };