diff --git a/home/hosts/andromache/default.nix b/home/hosts/andromache/default.nix
index e7db362..2bb7c38 100644
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@@ -12,6 +12,7 @@ in
 {
   imports = [
     ../../modules/cloud
+    ../../modules/comms
     ../../modules/desktop/niri
     ../../modules/3d
     ../../modules/git
@@ -37,6 +38,7 @@ in
 
   browser.primary = "librewolf";
   cloud.hetzner.enable = true;
+  comms.signal.enable = true;
   github.enable = true;
 
   shell.bash = {
diff --git a/home/hosts/astyanax/default.nix b/home/hosts/astyanax/default.nix
index a62490b..75869aa 100644
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -12,6 +12,7 @@ in
     ../../modules/ai-tools.nix
     ../../modules/anki.nix
     ../../modules/cloud
+    ../../modules/comms
     ../../modules/desktop/niri
     ../../modules/git
     ../../modules/k9s.nix
@@ -34,6 +35,7 @@ in
 
   browser.primary = "librewolf";
   cloud.hetzner.enable = true;
+  comms.signal.enable = true;
   github.enable = true;
 
   shell.bash = {
diff --git a/home/hosts/packages.nix b/home/hosts/packages.nix
index 60d2395..24947ea 100644
--- a/home/hosts/packages.nix
+++ b/home/hosts/packages.nix
@@ -22,7 +22,6 @@ with pkgs;
   pnpm
   python3
   ripgrep
-  signal-desktop
   silver-searcher
   sops
   sshfs
diff --git a/home/hosts/work/default.nix b/home/hosts/work/default.nix
index 47c37cb..f7abe3c 100644
--- a/home/hosts/work/default.nix
+++ b/home/hosts/work/default.nix
@@ -13,6 +13,7 @@ in
     inputs.sops-nix.homeManagerModules.sops
     ../../modules/ai-tools.nix
     ../../modules/cloud
+    ../../modules/comms
     ../../modules/dconf.nix
     ../../modules/git
     ../../modules/k9s.nix
@@ -61,6 +62,8 @@ in
   browser.primary = "firefox";
   browser.secondary = "chromium";
   cloud.azure.enable = true;
+  comms.signal.enable = true;
+  comms.teams.enable = true;
   github.enable = true;
   gitlab.enable = true;
 
diff --git a/home/modules/comms/default.nix b/home/modules/comms/default.nix
new file mode 100644
index 0000000..9761940
--- /dev/null
+++ b/home/modules/comms/default.nix
@@ -0,0 +1,17 @@
+{ lib, ... }:
+
+{
+  options.comms = {
+    signal = {
+      enable = lib.mkEnableOption "signal";
+    };
+    teams = {
+      enable = lib.mkEnableOption "teams";
+    };
+  };
+
+  imports = [
+    ./signal.nix
+    ./teams.nix
+  ];
+}
diff --git a/home/modules/comms/signal.nix b/home/modules/comms/signal.nix
new file mode 100644
index 0000000..4341efb
--- /dev/null
+++ b/home/modules/comms/signal.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  config = lib.mkIf config.comms.signal.enable {
+    home.packages = with pkgs; [
+      (if config.lib ? nixGL then config.lib.nixGL.wrap signal-desktop else signal-desktop)
+    ];
+  };
+}
diff --git a/home/modules/comms/teams.nix b/home/modules/comms/teams.nix
new file mode 100644
index 0000000..ec407e3
--- /dev/null
+++ b/home/modules/comms/teams.nix
@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  config = lib.mkIf config.comms.teams.enable {
+    home.packages = with pkgs; [
+      (if config.lib ? nixGL then config.lib.nixGL.wrap teams-for-linux else teams-for-linux)
+    ];
+  };
+}