diff --git a/packages/container-vault-sgx-azure/default.nix b/packages/container-vault-sgx-azure/default.nix
index f5826cd..2d899d2 100644
--- a/packages/container-vault-sgx-azure/default.nix
+++ b/packages/container-vault-sgx-azure/default.nix
@@ -48,7 +48,7 @@ nixsgxLib.mkSGXContainer {
         VAULT_API_ADDR.passthrough = true;
         VAULT_RAFT_NODE_ID.passthrough = true;
 
-        DNS_NAMES = "teepot-vault.teepot-vault,vault-0.teepot-vault,vault-1.teepot-vault,vault-2.teepot-vault";
+        DNS_NAMES = "teepot-vault.teepot-vault,teepot-vault-0.teepot-vault,teepot-vault-1.teepot-vault,teepot-vault-2.teepot-vault";
 
         # otherwise vault will lock a lot of unused EPC memory
         VAULT_RAFT_INITIAL_MMAP_SIZE = "0";
diff --git a/packages/container-vault-start-config/config.hcl b/packages/container-vault-start-config/config.hcl
index d3b6551..44ed903 100644
--- a/packages/container-vault-start-config/config.hcl
+++ b/packages/container-vault-start-config/config.hcl
@@ -18,7 +18,7 @@ listener "tcp" {
 storage "raft" {
   path = "/opt/vault/data/"
   # override via env var VAULT_RAFT_NODE_ID
-  node_id = "vault-0.teepot-vault"
+  node_id = "teepot-vault-0.teepot-vault"
 
   # Parameter needed because of slow plugin loading
   # may be relaxed for faster machines
@@ -27,19 +27,19 @@ storage "raft" {
   #autopilot_update_interval = "60s"
 
   retry_join {
-    leader_api_addr         = "https://vault-0.teepot-vault:8210"
+    leader_api_addr         = "https://teepot-vault-0.teepot-vault:8210"
     leader_ca_cert_file     = "/opt/vault/cacert.pem"
     leader_client_cert_file = "/opt/vault/tls/tls.crt"
     leader_client_key_file  = "/opt/vault/tls/tls.key"
   }
   retry_join {
-    leader_api_addr         = "https://vault-1.teepot-vault:8210"
+    leader_api_addr         = "https://teepot-vault-1.teepot-vault:8210"
     leader_ca_cert_file     = "/opt/vault/cacert.pem"
     leader_client_cert_file = "/opt/vault/tls/tls.crt"
     leader_client_key_file  = "/opt/vault/tls/tls.key"
   }
   retry_join {
-    leader_api_addr         = "https://vault-2.teepot-vault:8210"
+    leader_api_addr         = "https://teepot-vault-2.teepot-vault:8210"
     leader_ca_cert_file     = "/opt/vault/cacert.pem"
     leader_client_cert_file = "/opt/vault/tls/tls.crt"
     leader_client_key_file  = "/opt/vault/tls/tls.key"