diff --git a/hosts/nachtigall/apps/tmate.nix b/hosts/nachtigall/apps/tmate.nix
new file mode 100644
index 00000000..59018d30
--- /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 e548482d..ea60a16f 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 3798a27d..60226c09 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"