diff --git a/hosts/nachtigall/apps/forgejo.nix b/hosts/nachtigall/apps/forgejo.nix
index e455706..fdc941f 100644
--- a/hosts/nachtigall/apps/forgejo.nix
+++ b/hosts/nachtigall/apps/forgejo.nix
@@ -46,7 +46,6 @@
     user = "gitea";
     group = "gitea";
     package = pkgs.forgejo;
-    appName = "pub.solar git server";
     database = {
       type = "postgres";
       passwordFile = config.age.secrets.forgejo-database-password.path;
@@ -57,6 +56,8 @@
     lfs.enable = true;
     mailerPasswordFile = config.age.secrets.forgejo-mailer-password.path;
     settings = {
+      DEFAULT.APP_NAME = "pub.solar git server";
+
       server = {
         ROOT_URL = "https://git.pub.solar";
         DOMAIN = "git.pub.solar";
diff --git a/hosts/nachtigall/apps/tmate.nix b/hosts/nachtigall/apps/tmate.nix
new file mode 100644
index 0000000..59018d3
--- /dev/null
+++ b/hosts/nachtigall/apps/tmate.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+  services.tmate-ssh-server = {
+    enable = true;
+    port = 2222;
+    openFirewall = true;
+    host = "tmate.pub.solar";
+  };
+}
diff --git a/hosts/nachtigall/default.nix b/hosts/nachtigall/default.nix
index e548482..ea60a16 100644
--- a/hosts/nachtigall/default.nix
+++ b/hosts/nachtigall/default.nix
@@ -29,6 +29,7 @@
       ./apps/prometheus-exporters.nix
       ./apps/promtail.nix
       ./apps/searx.nix
+      ./apps/tmate.nix
 
       ./apps/matrix/irc.nix
       ./apps/matrix/mautrix-telegram.nix
diff --git a/terraform/dns.tf b/terraform/dns.tf
index 3798a27..60226c0 100644
--- a/terraform/dns.tf
+++ b/terraform/dns.tf
@@ -115,6 +115,11 @@ resource "namecheap_domain_records" "pub-solar" {
     type = "CNAME"
     address = "nachtigall.pub.solar."
   }
+  record {
+    hostname = "tmate"
+    type = "CNAME"
+    address = "nachtigall.pub.solar."
+  }
   record {
     hostname = "www"
     type = "CNAME"