diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a6ed8a..bbcc665 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,6 +88,7 @@ jobs:
       - name: Build check
         run: nix build .#checks.x86_64-linux.${{ matrix.check }} --print-build-logs
   build-server:
+    name: ${{ matrix.server }}
     needs: parse-flake
     uses: ./.github/workflows/build-host.yml
     with:
@@ -132,9 +133,10 @@ jobs:
             if [[ "$deployed_sha" == "$expected_sha" ]]; then
               echo "✅ ${{ matrix.server }} deployed $expected_sha"
               exit 0
+            else
+              echo "⏳ ${{ matrix.server }}: deployed ${deployed_sha::7}, waiting for ${expected_sha::7}..."
             fi
 
-            echo "⏳ ${{ matrix.server }}: deployed ${deployed_sha::7}, waiting for ${expected_sha::7}..."
             sleep 5
           done
   notify:
@@ -144,10 +146,6 @@ jobs:
     steps:
       - name: Notify success
         if: needs.await-deploy.result == 'success'
-        env:
-          BODY: |-
-            Commit `${{ github.sha }}` deployed successfully.
-            > ${{ github.event.head_commit.message }}
         run: |
           curl -s \
             -H "Title: CI: Deployment succeeded" \
@@ -155,14 +153,10 @@ jobs:
             -H "Tags: white_check_mark" \
             -H "Actions: view, Open workflow run, ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
             -H "Markdown: yes" \
-            -d "$BODY" \
+            -d $'Commit `'"${GITHUB_SHA::7}"$'` deployed successfully.\n> ${{ github.event.head_commit.message }}' \
             https://ntfy.sh/splitleaf
       - name: Notify failure
         if: needs.await-deploy.result == 'failure'
-        env:
-          BODY: |-
-            Commit `${{ github.sha }}` failed to deploy.
-            > ${{ github.event.head_commit.message }}
         run: |
           curl -s \
             -H "Title: CI: Deployment failed" \
@@ -170,5 +164,5 @@ jobs:
             -H "Tags: rotating_light" \
             -H "Actions: view, Open workflow run, ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
             -H "Markdown: yes" \
-            -d "$BODY" \
+            -d $'Commit `'"${GITHUB_SHA::7}"$'` failed to deploy.\n> ${{ github.event.head_commit.message }}' \
             https://ntfy.sh/splitleaf
diff --git a/modules/home/desktop/hyprland/classic.nix b/modules/home/desktop/hyprland/classic.nix
index f81c72b..1de96f5 100644
--- a/modules/home/desktop/hyprland/classic.nix
+++ b/modules/home/desktop/hyprland/classic.nix
@@ -11,7 +11,6 @@
     custom = {
       programs = {
         hyprland.enable = true;
-        waybar.enable = true;
         rofi.enable = true;
         hyprlock.enable = true;
       };
@@ -19,6 +18,7 @@
       services = {
         wpaperd.enable = true;
         hypridle.enable = true;
+        waybar.enable = true;
         cliphist.enable = true;
       };
     };
diff --git a/modules/home/programs/waybar.nix b/modules/home/services/waybar.nix
similarity index 95%
rename from modules/home/programs/waybar.nix
rename to modules/home/services/waybar.nix
index f0e514a..c6847e9 100644
--- a/modules/home/programs/waybar.nix
+++ b/modules/home/services/waybar.nix
@@ -1,8 +1,8 @@
 { config, lib, ... }:
 {
-  options.custom.programs.waybar.enable = lib.mkEnableOption "";
+  options.custom.services.waybar.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.programs.waybar.enable {
+  config = lib.mkIf config.custom.services.waybar.enable {
     programs.waybar = {
       enable = true;
       systemd.enable = true;