diff --git a/accounts-daemon/data/cosmic-accounts.service b/accounts-daemon/data/cosmic-accounts.service
index 957d46e..1b35b0a 100644
--- a/accounts-daemon/data/cosmic-accounts.service
+++ b/accounts-daemon/data/cosmic-accounts.service
@@ -1,14 +1,10 @@
-[Unit]
-Description=Online Accounts for COSMIC
-After=graphical-session.target
-
-[Service]
-Type=dbus
-BusName=dev.edfloreshz.Accounts
-ExecStart=/usr/bin/accounts-daemon
-Restart=on-failure
-RestartSec=1
-Environment=RUST_LOG=info
-
-[Install]
-WantedBy=default.target
+#  SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3 as published by
+# the Free Software Foundation.
+ 
+[D-BUS Service]
+Name=dev.edfloreshz.Accounts
+Exec=/usr/bin/accounts-daemon &
+User=root

diff --git a/justfile b/justfile
index 18f4444..c302d57 100644
--- a/justfile
+++ b/justfile
@@ -1,5 +1,14 @@
 # Accounts for COSMIC - Build and Installation Commands
 
+name := 'accounts'
+appid := 'dev.edfloreshz.Accounts'
+rootdir := ''
+prefix := '/usr'
+base-dir := absolute_path(clean(rootdir / prefix))
+etc-dst := clean(rootdir) / 'etc' / 'accounts' / 'providers'
+bin-dst := base-dir / 'bin'
+dbus-dst := clean(rootdir / prefix) / 'share' / 'dbus-1' / 'services'
+
 # Default recipe - show available commands
 default:
     @just --list
@@ -44,19 +53,18 @@ check: test lint check-format
 clean:
     cargo clean
 
 # Install daemon system-wide (requires sudo)
 install-daemon: build-daemon
-    sudo cp target/release/accounts-daemon /usr/bin/
-    sudo cp data/accounts.service /usr/share/dbus-1/services/
+    install -Dm0755 target/release/accounts-daemon -t {{ bin-dst }}
+    install -Dm0644 accounts-daemon/data/cosmic-accounts.service {{ dbus-dst }}/dev.edfloreshz.Accounts.service
 
 # Install GUI system-wide (requires sudo)
 install-gui: build-gui
-    sudo cp target/release/accounts-ui /usr/bin/
+    install -Dm0755 target/release/accounts-ui -t {{ bin-dst }}
 
 # Install provider configurations (requires sudo)
 install-configs:
-    sudo mkdir -p /etc/accounts/providers
-    sudo cp data/providers/*.toml /etc/accounts/providers/
+    install -Dm0644 accounts-daemon/data/providers/*.toml -t {{ etc-dst }}
     @echo "Remember to update OAuth2 credentials in /etc/accounts/providers/"
 
 # Install everything (requires sudo)

diff --git a/justfile b/justfile
index 66069fd..87d463b 100644
--- a/justfile
+++ b/justfile
@@ -1,6 +1,7 @@
 # Accounts for COSMIC - Build and Installation Commands
 
 name := 'accounts'
+ui-name := 'accounts-ui'
 appid := 'dev.edfloreshz.Accounts'
 rootdir := ''
 prefix := '/usr'
@@ -9,6 +10,17 @@ etc-dst := clean(rootdir) / 'etc' / 'accounts' / 'providers'
 bin-dst := base-dir / 'bin' /
 dbus-dst := clean(rootdir / prefix) / 'share' / 'dbus-1' / 'services'
 
+desktop := appid + '.desktop'
+desktop-src := ui-name / 'resources' / desktop
+desktop-dst := clean(rootdir / prefix) / 'share' / 'applications' / desktop
+appdata := appid + '.metainfo.xml'
+appdata-src := ui-name / 'resources' / appdata
+appdata-dst := clean(rootdir / prefix) / 'share' / 'metainfo' / appdata
+icons-src := ui-name / 'resources' / 'icons' / 'hicolor'
+icons-dst := clean(rootdir / prefix) / 'share' / 'icons' / 'hicolor'
+icon-svg-src := icons-src / 'scalable' / 'apps' / 'icon.svg'
+icon-svg-dst := icons-dst / 'scalable' / 'apps' / appid + '.svg'
+
 # Default recipe - show available commands
 default:
     @just --list
@@ -61,6 +73,9 @@ install-daemon: build-daemon
 # Install GUI system-wide (requires sudo)
 install-gui: build-gui
     install -Dm0755 target/release/accounts-ui -t {{ bin-dst }}
+    install -Dm0644 accounts-ui/resources/app.desktop {{desktop-dst}}
+    install -Dm0644 accounts-ui/resources/app.metainfo.xml {{appdata-dst}}
+    install -Dm0644 {{icon-svg-src}} {{icon-svg-dst}}
 
 # Install provider configurations (requires sudo)
 install-configs: