diff --git a/machines/terebithia/default.nix b/machines/terebithia/default.nix
index 4e6fc1e..3c90810 100644
--- a/machines/terebithia/default.nix
+++ b/machines/terebithia/default.nix
@@ -378,12 +378,14 @@
   atelier.services.cachet = {
     enable = true;
     domain = "cachet.dunkirk.sh";
+    deploy.repository = "https://github.com/taciturnaxolotl/cachet";
     secretsFile = config.age.secrets.cachet.path;
   };
 
   atelier.services.hn-alerts = {
     enable = true;
     domain = "hn.dunkirk.sh";
+    deploy.repository = "https://github.com/taciturnaxolotl/hn-alerts";
     secretsFile = config.age.secrets.hn-alerts.path;
   };
 
@@ -394,6 +396,7 @@
       port = 3002;
       workspace = "hackclub";
       channel = "C02T3CU03T3";
+      repository = "https://github.com/taciturnaxolotl/emojibot";
       secretsFile = config.age.secrets."emojibot/hackclub".path;
     };
 
@@ -478,12 +481,14 @@
   atelier.services.indiko = {
     enable = true;
     domain = "indiko.dunkirk.sh";
+    deploy.repository = "https://github.com/taciturnaxolotl/indiko";
   };
 
   atelier.services.l4 = {
     enable = true;
     domain = "l4.dunkirk.sh";
     port = 3004;
+    deploy.repository = "https://github.com/taciturnaxolotl/l4";
     deploy.autoUpdate = false;
     secretsFile = config.age.secrets.l4.path;
   };
@@ -491,7 +496,7 @@
   atelier.services.control = {
     enable = true;
     domain = "control.dunkirk.sh";
-    deploy.repository = "https://tangled.org/dunkirk.sh/control";
+    deploy.repository = "https://github.com/taciturnaxolotl/control";
     deploy.autoUpdate = false;
     secretsFile = config.age.secrets.control.path;
 
@@ -541,11 +546,11 @@
   atelier.services.canvas-mcp = {
     enable = true;
     domain = "canvas.dunkirk.sh";
+    deploy.repository = "https://github.com/taciturnaxolotl/canvas-mcp";
     secretsFile = config.age.secrets.canvas-mcp.path;
     environment = {
       DKIM_PRIVATE_KEY_FILE = "${config.age.secrets.canvas-mcp-dkim.path}";
     };
-    repository = "https://github.com/taciturnaxolotl/emojibot";
   };
 
   services.caddy.virtualHosts."terebithia.dunkirk.sh" = {
diff --git a/modules/nixos/services/canvas-mcp.nix b/modules/nixos/services/canvas-mcp.nix
index 9329ea2..8d46efd 100644
--- a/modules/nixos/services/canvas-mcp.nix
+++ b/modules/nixos/services/canvas-mcp.nix
@@ -21,7 +21,6 @@ mkService {
     systemd.services.canvas-mcp.serviceConfig.Environment = [
       "DATABASE_PATH=${cfg.dataDir}/data/canvas-mcp.db"
       "BASE_URL=https://${cfg.domain}"
-      "PORT=${toString cfg.port}"
     ];
 
     # Load secrets from agenix if configured