diff --git a/modules/step-ca/module.json b/modules/step-ca/module.json
index f9f12b0..de3697b 100644
--- a/modules/step-ca/module.json
+++ b/modules/step-ca/module.json
@@ -57,7 +57,7 @@
       "type": "file",
       "path": "/var/lib/mesh/step-ca/init.env",
       "mode": "0600",
-      "content": "DOCKER_STEPCA_INIT_PASSWORD=${secret:password}\n"
+      "content": "DOCKER_STEPCA_INIT_PASSWORD=${secret:password}\nDOCKER_STEPCA_INIT_DNS_NAMES=${machine:at},${machine:name},localhost,127.0.0.1\n"
     },
     {
       "id": "root-cert-file",
@@ -94,7 +94,6 @@
       ],
       "env": {
         "DOCKER_STEPCA_INIT_NAME": "Mesh Internal CA",
-        "DOCKER_STEPCA_INIT_DNS_NAMES": "localhost,127.0.0.1",
         "DOCKER_STEPCA_INIT_ACME": "true",
         "DOCKER_STEPCA_INIT_REMOTE_MANAGEMENT": "false",
         "DOCKER_STEPCA_INIT_ROOT_FILE": "/run/secrets/root_ca.crt",