diff --git a/arch-desktop.yaml b/arch-desktop.yaml
index b42de53..b358e55 100644
--- a/arch-desktop.yaml
+++ b/arch-desktop.yaml
@@ -5,13 +5,15 @@ stages:
     run: |
       if [[ "$BASE_DESKTOP" = gnome ]]; then
         pacman -Syqu --noconfirm gnome
+        systemctl enable gdm
       elif [[ "$BASE_DESKTOP" = plasma ]]; then
-        pacman -Syqu --noconfirm plasma \
+        pacman -Syqu --noconfirm sddm plasma \
                                  kde-accessibility-meta \
                                  kde-multimedia-meta \
                                  kde-system-meta \
                                  kde-utilities-meta \
                                  discover
+        systemctl enable sddm
       fi
 
 env:
diff --git a/arch.yaml b/arch.yaml
index 29d06c4..0c97a7b 100644
--- a/arch.yaml
+++ b/arch.yaml
@@ -43,10 +43,6 @@ stages:
       - "python-requests"
       - "python-fasteners"
 
-  - module: systemctl-enable
-    inputs:
-      - NetworkManager
-
   - module: exec
     inputs:
       - |
@@ -85,6 +81,15 @@ stages:
         git clone --revision "$BASE_AKSHARA_REPO_COMMIT" --depth 1 "$BASE_AKSHARA_REPO" /akshara
         cp -a /akshara/usr/* /usr
 
+  - module: systemctl-enable
+    inputs:
+      - akshara-update-cleanup
+      - NetworkManager
+
+  - module: systemctl-user-enable
+    inputs:
+      - akshara-update-check
+
 post-stages:
   - module: exec
     inputs:
diff --git a/ubuntu.yaml b/ubuntu.yaml
index 90e4ba7..aa6bf1f 100644
--- a/ubuntu.yaml
+++ b/ubuntu.yaml
@@ -10,6 +10,14 @@ modules:
     run: |
       DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -yq "$@"
 
+  - name: systemctl-enable
+    run: |
+      systemctl enable "$@"
+
+  - name: systemctl-user-enable
+    run: |
+      systemctl --global enable "$@"
+
 stages:
   - module: exec
     inputs: