diff --git a/common.nix b/common.nix
index 92c64a6..b881e5c 100644
--- a/common.nix
+++ b/common.nix
@@ -1214,6 +1214,12 @@ isoConfig
   services.xserver = {
     enable = true;
     desktopManager.gnome.enable = true;
-    displayManager.gdm.enable = true;
+    displayManager.gdm = {
+      enable = true;
+      autoLogin = {
+        enable = true;
+        user = "workshop";
+      };
+    };
   };
 }
diff --git a/flake.nix b/flake.nix
index 203be0d..6d1e739 100644
--- a/flake.nix
+++ b/flake.nix
@@ -113,15 +113,10 @@
                 "-device"
                 "virtio-net,netdev=net0"
               ];
-              # Fix the auto-login conflict with mkForce
-              services.displayManager.autoLogin = lib.mkForce {
-                enable = true;
-                user = "root";
-              };
-              # Keep GUI session commands for when GUI is used
-              services.xserver.displayManager.sessionCommands = ''
-                ${pkgs.gnome-terminal}/bin/gnome-terminal --full-screen --title="Workshop Terminal" &
-              '';
+               # Keep GUI session commands for when GUI is used
+               services.xserver.displayManager.sessionCommands = ''
+                 ${pkgs.gnome-terminal}/bin/gnome-terminal --full-screen --title="Workshop Terminal" &
+               '';
             }
           )
         ];