diff --git a/hosts/celaeno/services/minecraft/servers/create-above-and-beyond/default.nix b/hosts/celaeno/services/minecraft/servers/create-above-and-beyond/default.nix
index 0f99fbcd..64b519fc 100644
--- a/hosts/celaeno/services/minecraft/servers/create-above-and-beyond/default.nix
+++ b/hosts/celaeno/services/minecraft/servers/create-above-and-beyond/default.nix
@@ -1,5 +1,6 @@
 {pkgs, ...}: let
-  forge = "forge-1.16.5-36.2.8";
+  forge = "forge-1.16.5-36.2.20.jar";
+  forgeInstaller = "forge-1.16.5-36.2.20-installer.jar";
   modpack = pkgs.fetchzip {
     url = "https://www.curseforge.com/api/v1/mods/542763/files/3567576/download";
     hash = "sha256-B/fbtYpgGwj+Tcr1gAIpIH60leOrAkzcfIARZQFl5Yk=";
@@ -11,11 +12,13 @@ in {
     enable = true;
     enableReload = true;
     extraStartPre = ''
-      if ! [ -e "${forge}.jar" ]; then
-        ${pkgs.jre8}/bin/java -jar ${forge}-installer.jar --installServer
+      if ! [ -e "${forge}" ]; then
+        ${pkgs.jre8}/bin/java -jar ${forgeInstaller} --installServer
       fi
     '';
-    package = modpack;
+    package = pkgs.writeShellScriptBin "server" ''
+      exec ${pkgs.jre8}/bin/java $@ -jar ${forge} nogui
+    '';
     jvmOpts = (import ../../aikar-flags.nix) "8G";
 
     serverProperties = {
@@ -29,7 +32,7 @@ in {
       config = "${modpack}/config";
     };
     symlinks = {
-      "${forge}-installer.jar" = "${modpack}/${forge}-installer.jar";
+      "${forgeInstaller}" = "${modpack}/${forgeInstaller}";
       "server-icon.png" = "${modpack}/server-icon.png";
       defaultconfigs = "${modpack}/defaultconfigs";
       kubejs = "${modpack}/kubejs";