diff --git a/lib/constants.nix b/lib/constants.nix
index 7439c36..f16671f 100644
--- a/lib/constants.nix
+++ b/lib/constants.nix
@@ -173,6 +173,10 @@ rec {
         port = 25565;
         dst = aa.simpcraft-oci.internal.ipv4.address;
       }
+      # {
+      #   port = 25566;
+      #   dst = aa.simpcraft-staging-oci.internal.ipv4.address;
+      # }
 
       {
         port = 2456;
@@ -190,6 +194,12 @@ rec {
         dst = aa.waffletail.internal.ipv4.address;
         proto = "udp";
       }
+
+      {
+        port = 25565;
+        dst = aa.simpcraft-oci.internal.ipv4.address;
+        proto = "udp";
+      }
     ];
 
     fstrimConfig = {
diff --git a/nixos/boxes/colony/vms/estuary/default.nix b/nixos/boxes/colony/vms/estuary/default.nix
index f06973c..bf1d955 100644
--- a/nixos/boxes/colony/vms/estuary/default.nix
+++ b/nixos/boxes/colony/vms/estuary/default.nix
@@ -400,6 +400,7 @@ in
                     chain routing-udp {
                       ip6 daddr ${aa.valheim-oci.internal.ipv6.address} udp dport { 2456-2457 } accept
                       ip6 daddr ${aa.waffletail.internal.ipv6.address} udp dport 41641 accept
+                      ip6 daddr ${aa.simpcraft-oci.internal.ipv6.address} udp dport 25565 accept
                       return
                     }
                     chain filter-routing {
diff --git a/nixos/boxes/colony/vms/whale2/default.nix b/nixos/boxes/colony/vms/whale2/default.nix
index dd6b157..0eec004 100644
--- a/nixos/boxes/colony/vms/whale2/default.nix
+++ b/nixos/boxes/colony/vms/whale2/default.nix
@@ -51,6 +51,7 @@ in
     }) {
       valheim-oci = 2;
       simpcraft-oci = 3;
+      # simpcraft-staging-oci = 4;
     };
 
     configuration = { lib, pkgs, modulesPath, config, assignments, allAssignments, ... }:
diff --git a/nixos/boxes/colony/vms/whale2/minecraft/default.nix b/nixos/boxes/colony/vms/whale2/minecraft/default.nix
index 5a6fd50..821ebfe 100644
--- a/nixos/boxes/colony/vms/whale2/minecraft/default.nix
+++ b/nixos/boxes/colony/vms/whale2/minecraft/default.nix
@@ -13,14 +13,14 @@ in
         image = "ghcr.io/itzg/minecraft-server:2023.12.2-java17-alpine";
 
         environment = {
-          TYPE = "paper";
+          TYPE = "MODRINTH";
 
           EULA = "true";
+          ENABLE_QUERY = "true";
           MOTD = "§4§k----- §9S§ai§bm§cp§dc§er§fa§6f§5t §4§k-----";
           ICON = "/ext/icon.png";
-          DIFFICULTY = "normal";
 
-          OVERRIDE_WHITELIST = "true";
+          EXISTING_WHITELIST_FILE = "SYNCHRONIZE";
           WHITELIST = concatStringsSep "," [
             op
             "dcd2ecb9-2b5e-49cb-9d4f-f5a76162df56" # Elderlypug
@@ -33,12 +33,14 @@ in
             "f439f64d-91c9-4c74-9ce5-df4d24cd8e05" # hynge_
             "d6ec4c91-5da2-44eb-b89d-71dc8fe017a0" # Eefah98
           ];
+          EXISTING_OPS_FILE = "SYNCHRONIZE";
           OPS = op;
+          DIFFICULTY = "normal";
           SPAWN_PROTECTION = "0";
           VIEW_DISTANCE = "20";
 
-          MAX_MEMORY = "4G";
-          MODRINTH_PROJECTS = concatStringsSep "," [ ];
+          MAX_MEMORY = "6G";
+          MODRINTH_MODPACK = "https://cdn.modrinth.com/data/CIYf3Hk8/versions/CN6MqSAU/Simpcraft-0.1.0.mrpack";
 
           TZ = "Europe/Dublin";
         };