diff --git a/Makefile b/Makefile
index 5fb7a97..7ba070d 100644
--- a/Makefile
+++ b/Makefile
@@ -68,15 +68,15 @@ test-usb: build-usb
 		-device virtio-net,netdev=net0 \
 		-display gtk
 
-vm-run:
-	@echo "🖥️ Starting workshop VM..."
-	nix run .#local-vm
-
 vm: vm-run
 
-vm-build:
-	@echo "🧪 Testing VM build..."
-	nix build .#local-vm
+vm-run:
+	@echo "🖥️ Starting workshop VM as root..."
+	nix run .#local-vm -- --extra-experimental-features 'nix-command flakes' --command root
+
+vm: vm-build
+	@echo "🧪 Testing VM build as root..."
+	nix build --extra-experimental-features 'nix-command flakes' .#local-vm
 	@echo "✅ VM builds successfully"
 
 deploy-cloud:
diff --git a/common.nix b/common.nix
index 0de8890..afff4aa 100644
--- a/common.nix
+++ b/common.nix
@@ -183,21 +183,22 @@ isoConfig // {
         sleep 2
       done
 
-      # Install abra for workshop user (as root, but install to user home)
-      if [ ! -f /home/workshop/.local/bin/abra ]; then
-        echo "🚀 Installing abra for user workshop..."
-        mkdir -p /home/workshop/.local/bin
-        # Download and install as root, but to user directory
-        HOME=/home/workshop curl -fsSL https://install.abra.coopcloud.tech | bash
-        # Fix ownership
-        chown -R workshop:workshop /home/workshop/.local
-        if [ -f /home/workshop/.local/bin/abra ]; then
-          echo "✅ abra installed successfully."
+      # Install abra for workshop user - as root, to /usr/local/bin
+      if [ ! -f /usr/local/bin/abra ]; then
+        echo "🚀 Installing abra for root user..."
+        
+        # Download and install abra directly to /usr/local/bin
+        curl -fsSL https://install.abra.coopcloud.tech | bash
+        
+        if [ -f /usr/local/bin/abra ] && [ -x /usr/local/bin/abra ]; then
+          echo "✅ abra installed successfully to /usr/local/bin/abra"
         else
           echo "❌ abra installation failed."
+          echo "🔍 Debug: Contents of /usr/local/bin:"
+          ls -la /usr/local/bin/abra 2>/dev/null || echo "File not found"
         fi
       else
-        echo "✅ abra already installed."
+        echo "✅ abra already installed at /usr/local/bin/abra"
       fi
 
       # Initialize Docker Swarm
diff --git a/flake.nix b/flake.nix
index 5066a3a..02d0d89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,7 +98,7 @@
             # Fix the auto-login conflict with mkForce
             services.displayManager.autoLogin = lib.mkForce {
               enable = true;
-              user = "workshop";
+              user = "root";
             };
             # Keep GUI session commands for when GUI is used
             services.xserver.displayManager.sessionCommands = ''