diff --git a/smtp-server/service-smtp.json b/smtp-server/service-smtp.json
index d320891..2cc333b 100644
--- a/smtp-server/service-smtp.json
+++ b/smtp-server/service-smtp.json
@@ -59,7 +59,7 @@
                 }
             ],
             "ENV_FILES": [
-                "/etc/user/secret/smtp-server/smtp-secret.json"
+                "/etc/user/config/services/smtp-secret.json"
             ],
             "EXTRA": "null",
             "DEPEND": "null",
diff --git a/vaultwarden/service-vaultwarden.json b/vaultwarden/service-vaultwarden.json
index 7b37826..33c3ee3 100644
--- a/vaultwarden/service-vaultwarden.json
+++ b/vaultwarden/service-vaultwarden.json
@@ -116,6 +116,9 @@
                     "VAULTWARDEN_SMTP_USERNAME": "#VAULTWARDEN_SMTP_USERNAME"
                 }
             ],
+            "ENV_FILES": [
+                "/etc/user/config/services/vaultwarden-secret.json"
+            ],
             "EXTRA": "--restart unless-stopped",
             "DEPEND": [],
             "START_ON_BOOT": "false",
diff --git a/vaultwarden/template.json b/vaultwarden/template.json
index 3176fc0..5af45b8 100644
--- a/vaultwarden/template.json
+++ b/vaultwarden/template.json
@@ -1,6 +1,12 @@
 {
     "name": "vaultwarden",
     "fields": [
+        {
+            "description": "Please add your very secret VaultWarden admin key (please use any token generator or add minimum 12 character long random string):",
+            "key": "VAULTWARDEN_ADMIN_TOKEN",
+            "value": "",
+            "required": "true"
+        },
         {
             "description": "MYSQL database name",
             "key": "DB_MYSQL",