diff --git a/packages/nixos/image.nix b/packages/nixos/image.nix
index a62342e0f..192102e5c 100644
--- a/packages/nixos/image.nix
+++ b/packages/nixos/image.nix
@@ -45,7 +45,7 @@
           Minimize = "best";
           # We need to ensure that mountpoints are available.
           # TODO (Maybe): This could be done more elegantly with CopyFiles and a skeleton tree in the vcs.
-          MakeDirectories = "/bin /boot /dev /etc /home /lib /lib64 /mnt /nix /opt /proc /root /run /srv /sys /tmp /usr /var";
+          MakeDirectories = "/bin /boot /dev /etc /home /lib /lib64 /mnt /nix /opt /proc /root /run /srv /sys /tmp /usr/bin /var";
         };
       };
 
diff --git a/packages/nixos/system.nix b/packages/nixos/system.nix
index 300b52f24..d11a336ac 100644
--- a/packages/nixos/system.nix
+++ b/packages/nixos/system.nix
@@ -60,7 +60,7 @@
           "/var"
           "/etc"
           "/bin"
-          "/usr"
+          "/usr/bin"
           "/tmp"
           "/lib"
           "/root"