diff --git a/system/desktop.nix b/system/desktop.nix
index f2cf2c94..f6f12ba8 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -31,6 +31,7 @@
       fractal
       webcord
       signal-desktop
+      whatsapp-for-linux
       teams-for-linux
       twinkle
       nomachine-client
@@ -188,16 +189,35 @@
             early_exit=false
             fill_shape=false
           '';
+          # WhatsApp config
+          "whatsapp-for-linux/settings.conf" = {
+            force = true;
+            text = ''
+              [web]
+              allow-permissions=true
+              hw-accel=2
+
+              [general]
+              notification-sounds=true
+              close-to-tray=true
+              start-in-tray=true
+            '';
+          };
+          # Teams config
+          "teams-for-linux/config.json" = {
+            force = true;
+            text = builtins.toJSON {
+              awayOnSystemIdle = true;
+              closeAppOnCross = false;
+              followSystemTheme = true;
+              notificationMethod = "electron";
+              optInTeamsV2 = true;
+              spellCheckerLanguages = [ "en_GB" ];
+            };
+          };
           # Autostart some programs
           "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
-          "teams-for-linux/config.json".text = builtins.toJSON {
-            awayOnSystemIdle = true;
-            closeAppOnCross = false;
-            followSystemTheme = true;
-            notificationMethod = "electron";
-            optInTeamsV2 = true;
-            spellCheckerLanguages = [ "en_GB" ];
-          };
+          "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
         };
       };
     };
diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix
index 8a52cbb3..d5275d1c 100644
--- a/system/home/hyprland.nix
+++ b/system/home/hyprland.nix
@@ -243,7 +243,7 @@
 
         # Workspace rules
         "workspace 2, (firefox|nyxt|org.qutebrowser.qutebrowser)" # Browser
-        "workspace 3, (signal|com.rtosta.zapzap|WebCord|teams-for-linux|twinkle)" # Messaging
+        "workspace 3, (signal|whatsapp-for-linux|WebCord|teams-for-linux|twinkle)" # Messaging
         "workspace 4, (com.github.neithern.g4music)" # Music
         "workspace 5, (org.remmina.Remmina|Nxplayer.bin)" # Remote Desktop
         "workspace 6, (lutris|page.kramo.Cartridges|org.prismlauncher.PrismLauncher)" # Gaming
diff --git a/system/home/scripts/shell/clean-config.sh b/system/home/scripts/shell/clean-config.sh
index de1456ff..9a383ec8 100644
--- a/system/home/scripts/shell/clean-config.sh
+++ b/system/home/scripts/shell/clean-config.sh
@@ -1,2 +1,2 @@
 shopt -s extglob
-rm -rf ~/.config/!(dconf|protonmail|Signal)
+rm -rf ~/.config/!(dconf|protonmail|Signal|whatsapp-for-linux)
diff --git a/system/home/waybar.nix b/system/home/waybar.nix
index 02518458..0d6887f0 100644
--- a/system/home/waybar.nix
+++ b/system/home/waybar.nix
@@ -73,7 +73,7 @@
           "Nyxt - (.*)" = "󰀹  $1";
           "(.*) - Chromium" = "󰊯  $1";
           "(Signal.*)" = "󰭹  $1";
-          "(ZapZap.*)" = "󰖣  $1";
+          "(WhatsApp for Linux.*)" = "󰖣  $1";
           "((?:.*)WebCord.*)" = "󰙯  $1";
           "(Cartridges.*)" = "󰊗  $1";
           "([Ss]team.*)" = "󰓓  $1";