diff --git a/configuration-nas.nix b/configuration-nas.nix
index 4c3912e..d4efef2 100644
--- a/configuration-nas.nix
+++ b/configuration-nas.nix
@@ -142,6 +142,10 @@ in
     };
   };
 
+  # libnvidia-container does not support cgroups v2 (prior to 1.8.0)
+  # https://github.com/NVIDIA/nvidia-docker/issues/1447
+  systemd.enableUnifiedCgroupHierarchy = false;
+
   systemd.services.nas-mounts = {
     path = [ pkgs.zfs pkgs.bash ];
     script = ''
@@ -232,6 +236,7 @@ in
 
   virtualisation.docker.enable = true;
   virtualisation.docker.enableNvidia = true;
+  virtualisation.docker.enableOnBoot = true;
 
   # This option defines the first version of NixOS you have installed on this particular machine,
   # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.