diff --git a/scripts/hm-bootstrap.sh b/scripts/hm-bootstrap.sh
index 8131681..52f828c 100644
--- a/scripts/hm-bootstrap.sh
+++ b/scripts/hm-bootstrap.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-UID="$(id -u)"
+USER_ID="$(id -u)"
 USER_NAME="$(id -un)"
-USER_BUS="/run/user/$UID/bus"
+USER_BUS="/run/user/$USER_ID/bus"
 HM_DIR="$HOME/.config/home-manager"
 SKEL_DIR="/etc/skel/.config/home-manager"
 EXPECTED_USER="${NANUQSAURUS_ADMIN_USER:-}"
diff --git a/templates/home-home.nix b/templates/home-home.nix
index 2151c60..b20aacb 100644
--- a/templates/home-home.nix
+++ b/templates/home-home.nix
@@ -36,10 +36,10 @@
         skip_workdir = "1";
       };
       containers = {
-        ubuntu = {
-          image = "ubuntu:latest";
-          entry = true;
-        };
+        # ubuntu = {
+        #   image = "ubuntu:latest";
+        #   entry = true;
+        # };
       };
     };
     home-manager.enable = true;
@@ -82,7 +82,7 @@
     # alacritty           # GPU accelerated terminal emulator
     # kitty               # GPU accelerated terminal emulator
 
-    jetbrains-toolbox # fresh versions of Android Studio and other tools
+    # jetbrains-toolbox # fresh versions of Android Studio and other tools
     # devpod              # open-source code spaces
 
     pods # Podman desktop application
@@ -95,15 +95,12 @@
     '';
   };
 
-  xdg.userDirs = {
-    enable = true;
-  };
-
   home.sessionVariables = {
     # you can change the default terminal and editor here
     TERMINAL = "${pkgs.ptyxis}/bin/ptyxis";
     DEFAULT_TERMINAL = "${pkgs.ptyxis}/bin/ptyxis";
     EDITOR = "micro";
+    # Enables distinct home folders for each distrobox in ~/distrobox
     DBX_CONTAINER_HOME_PREFIX = "$HOME/distrobox";
   };