diff --git a/config/nixos/configuration.nix b/config/nixos/configuration.nix
index 3bb2a3e..d15fe7d 100644
--- a/config/nixos/configuration.nix
+++ b/config/nixos/configuration.nix
@@ -16,10 +16,9 @@
     ]
     # Include packages based on whether this is a server or workstation.
     ++ lib.optional isServer ./packages/server/default.nix
-    ++ lib.optional isWorkstation ./packages/workstation/default.nix;
-  # Include docker if this is a server, otherwise include nothing because we don't intend on running docker services on workstations.
-  # ++ lib.optional isServer ./docker/default.nix;
-  # TODO: Enable the line above once we migrated the basic server configuration to the new NixOS setup.
+    ++ lib.optional isWorkstation ./packages/workstation/default.nix
+    # Include docker if this is a server, otherwise include nothing because we don't intend on running docker services on workstations.
+    ++ lib.optional isServer ./docker/default.nix;
 
   # Enable networking
   networking.networkmanager.enable = true;
diff --git a/config/nixos/docker/default.nix b/config/nixos/docker/default.nix
index 7ee986b..9ad1f4c 100644
--- a/config/nixos/docker/default.nix
+++ b/config/nixos/docker/default.nix
@@ -1,12 +1,17 @@
-{ config, pkgs, ... }:
-
-let
-  files = builtins.removeAttrs (builtins.readDir ./.) [ "default.nix" ];
-
-  # Import all other .nix files as modules
-  moduleFiles = builtins.map (fname: ./. + "/${fname}") (builtins.attrNames files);
-in
+{ ... }:
 {
-  # Import all the package modules
-  imports = moduleFiles;
+  imports = [ ./minecraft.nix ];
 }
+# TODO: Import all the package modules, disabled for testing one by one.
+# { config, pkgs, ... }:
+
+# let
+#   files = builtins.removeAttrs (builtins.readDir ./.) [ "default.nix" ];
+
+#   # Import all other .nix files as modules
+#   moduleFiles = builtins.map (fname: ./. + "/${fname}") (builtins.attrNames files);
+# in
+# {
+#   # Import all the package modules
+#   imports = moduleFiles;
+# }
diff --git a/config/nixos/hardware/mennos-server.nix b/config/nixos/hardware/mennos-server.nix
index baef2f3..ccbd644 100644
--- a/config/nixos/hardware/mennos-server.nix
+++ b/config/nixos/hardware/mennos-server.nix
@@ -8,7 +8,7 @@
 {
   imports = [
     /etc/nixos/hardware-configuration.nix
-    # ./mennos-server/zfs.nix
+    ./mennos-server/zfs.nix
   ];
   networking.hostName = "mennos-server";
   networking.hostId = "64519940";