diff --git a/modules/kubernetes/authentik/values.yaml b/modules/kubernetes/authentik/values.yaml
index 95147651..ccfa3acd 100644
--- a/modules/kubernetes/authentik/values.yaml
+++ b/modules/kubernetes/authentik/values.yaml
@@ -5,11 +5,11 @@ authentik:
   error_reporting:
     enabled: true
   postgresql:
-    host: postgresql.dbaas.svc.cluster.local
+    host: postgresql.dbaas
     user: authentik
     password: ${postgres_password}
   redis:
-    host: redis.redis.svc.cluster.local
+    host: redis.redis
 
 server:
   ingress:
diff --git a/modules/kubernetes/dawarich/main.tf b/modules/kubernetes/dawarich/main.tf
index 9eefa75d..9d75bbac 100644
--- a/modules/kubernetes/dawarich/main.tf
+++ b/modules/kubernetes/dawarich/main.tf
@@ -67,7 +67,7 @@ resource "kubernetes_deployment" "dawarich" {
           args    = ["bin/dev"]
           env {
             name  = "REDIS_URL"
-            value = "redis://redis.redis.svc.cluster.local:6379/0"
+            value = "redis://redis.redis:6379/0"
           }
           env {
             name  = "DATABASE_HOST"
diff --git a/modules/kubernetes/hackmd/main.tf b/modules/kubernetes/hackmd/main.tf
index a845483c..36fda63d 100644
--- a/modules/kubernetes/hackmd/main.tf
+++ b/modules/kubernetes/hackmd/main.tf
@@ -85,7 +85,7 @@ resource "kubernetes_deployment" "hackmd" {
           env {
             name = "CMD_DB_URL"
             # value = format("%s%s%s", "postgres://codimd:", var.hackmd_db_password, "@localhost/codimd")
-            value = format("%s%s%s", "mysql://codimd:", var.hackmd_db_password, "@mysql.dbaas.svc.cluster.local/codimd")
+            value = format("%s%s%s", "mysql://codimd:", var.hackmd_db_password, "@mysql.dbaas/codimd")
           }
           env {
             name  = "CMD_USECDN"