diff --git a/nixos/os/configuration.nix b/nixos/os/configuration.nix
index 374c7f73..849a77df 100755
--- a/nixos/os/configuration.nix
+++ b/nixos/os/configuration.nix
@@ -191,7 +191,7 @@
     gnome-extension-manager
     gnomeExtensions.dash-to-dock
     git
-    qitech-control.packages.${pkgs.system}.electron
+    qitech-control-electron
   ];
 
   environment.gnome.excludePackages = (with pkgs; [
diff --git a/nixos/os/home.nix b/nixos/os/home.nix
index 7a77f204..844e7221 100755
--- a/nixos/os/home.nix
+++ b/nixos/os/home.nix
@@ -21,19 +21,18 @@
     };
   };
 
-  xdg.autostart.enable = true;
-  xdg.autostart.entries = {
-    qitech-control = {
-      name = "QiTech Control";
-      exec = "QITECH_BUILD_ENV=control-os QITECH_DEPLOYMENT_TYPE=production qitech-control-electron";
-      icon = "de.qitech.control-electron";
-      comment = "QiTech Industries Control Software";
-      settings = {
-        "X-GNOME-Autostart-enabled" = "true";
-        "X-GNOME-Autostart-Phase" = "Applications";
-      };
-    };
-  };
+  xdg.configFile."autostart/de.qitech.control-electron.desktop".text = ''
+    [Desktop Entry]
+    Type=Application
+    Name=QiTech Control
+    Comment=QiTech Industries Control Software
+    Exec=QITECH_BUILD_ENV=control-os QITECH_DEPLOYMENT_TYPE=production qitech-control-electron
+    Icon=de.qitech.control-electron
+    Terminal=false
+    StartupWMClass=QiTech Control
+    X-GNOME-Autostart-enabled=true
+    X-GNOME-Autostart-Phase=Applications
+  '';
   
   dconf.settings = {
     # Set GNOME wallpaper