diff --git a/config/hosts/athame/nixos.nix b/config/hosts/athame/nixos.nix
index b4b7ae44..0e3ec32b 100644
--- a/config/hosts/athame/nixos.nix
+++ b/config/hosts/athame/nixos.nix
@@ -19,6 +19,7 @@ with lib;
     services.postgres
     services.radicale
     services.restic
+    services.roundcube
     services.syncplay
     services.taskserver
     services.vaultwarden
diff --git a/config/services/roundcube/default.nix b/config/services/roundcube/default.nix
new file mode 100644
index 00000000..0c63ca85
--- /dev/null
+++ b/config/services/roundcube/default.nix
@@ -0,0 +1,13 @@
+{ config, ... }: {
+  services.roundcube = {
+    enable = true;
+    hostName = "mail.${config.network.dns.domain}";
+  };
+
+
+  deploy.tf.dns.records.services_roundcube = {
+    inherit (config.network.dns) zone;
+    domain = "mail";
+    cname = { inherit (config.network.addresses.public) target; };
+  };
+}
diff --git a/config/targets/infra.nix b/config/targets/infra.nix
deleted file mode 100644
index 4a3b68a0..00000000
--- a/config/targets/infra.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, ... }:
-
-{
-  deploy.targets.infra = {
-    nodeNames = [ "athame" ];
-  };
-}