diff --git a/stacks/headscale/main.tf b/stacks/headscale/main.tf
index 5741c9aa..8fd0c3e3 100644
--- a/stacks/headscale/main.tf
+++ b/stacks/headscale/main.tf
@@ -16,6 +16,7 @@ module "headscale" {
   nfs_server             = var.nfs_server
   headscale_config       = data.vault_kv_secret_v2.secrets.data["headscale_config"]
   headscale_acl          = data.vault_kv_secret_v2.secrets.data["headscale_acl"]
+  headscale_derp_map     = data.vault_kv_secret_v2.secrets.data["headscale_derp_map"]
   homepage_token         = try(local.homepage_credentials["headscale"]["api_key"], "")
   tier                   = local.tiers.core
   ui_cookie_secret       = data.vault_kv_secret_v2.secrets.data["headscale_ui_cookie_secret"]
diff --git a/stacks/headscale/modules/headscale/main.tf b/stacks/headscale/modules/headscale/main.tf
index 98b6575a..33cb83dc 100644
--- a/stacks/headscale/modules/headscale/main.tf
+++ b/stacks/headscale/modules/headscale/main.tf
@@ -17,6 +17,9 @@ variable "ui_api_key" {
   type      = string
   sensitive = true
 }
+variable "headscale_derp_map" {
+  type = string
+}
 
 resource "kubernetes_namespace" "headscale" {
   metadata {
@@ -151,6 +154,10 @@ resource "kubernetes_deployment" "headscale" {
               key  = "acl.yaml"
               path = "acl.yaml"
             }
+            items {
+              key  = "derp.yaml"
+              path = "derp.yaml"
+            }
           }
         }
 
@@ -370,6 +377,7 @@ resource "kubernetes_config_map" "headscale-config" {
   data = {
     "config.yaml" = var.headscale_config
     "acl.yaml"    = var.headscale_acl
+    "derp.yaml"   = var.headscale_derp_map
   }
 }