diff --git a/flake.nix b/flake.nix
index 76eb107..63b0048 100644
--- a/flake.nix
+++ b/flake.nix
@@ -305,11 +305,12 @@
 
         # Map nodes to Deploy-rs deployments
         deploy.nodes = {
-          thor = { hostname = "thor.tsn"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.thor; }; };
-          odin = { hostname = "odin.tsn"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.odin; }; };
-          loki = { hostname = "loki.tsn"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.loki; }; };
           baldur = { hostname = "baldur.bertof.net"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.baldur; }; };
           freya = { hostname = "freya.tsn"; profiles.system = { user = "root"; path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.freya; }; };
+          heimdall = { hostname = "heimdall.tsn"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.heimdall; }; };
+          loki = { hostname = "loki.tsn"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.loki; }; };
+          odin = { hostname = "odin.tsn"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.odin; }; };
+          thor = { hostname = "thor.tsn"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.thor; }; };
         };
       };
 
diff --git a/modules/nixos/nextcloud.nix b/modules/nixos/nextcloud.nix
index d62694e..25a6135 100644
--- a/modules/nixos/nextcloud.nix
+++ b/modules/nixos/nextcloud.nix
@@ -24,6 +24,10 @@ in
 
     database.createLocally = true;
 
+    extraApps = {
+      inherit (pkgs.nextcloud28Packages.apps) mail calendar contact;
+    };
+
     autoUpdateApps.enable = true;
     extraOptions.enabledPreviewProviders = [
       "OC\\Preview\\BMP"