diff --git a/vaultwarden/firewall-vaultwarden-dns.json b/vaultwarden/firewall-vaultwarden-dns.json
new file mode 100644
index 0000000..26a666b
--- /dev/null
+++ b/vaultwarden/firewall-vaultwarden-dns.json
@@ -0,0 +1,75 @@
+{
+    "main": {
+        "SERVICE_NAME": "firewalls",
+        "DOMAIN": "null"
+    },
+    "containers": [
+        {
+            "IMAGE": "registry.format.hu/firewall",
+            "NAME": "firewall",
+            "MEMORY": "64M",
+            "NETWORK": "host",
+            "SCALE": "0",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/run/",
+                    "DEST": "/run/",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services",
+                    "DEST": "/services",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "ENVS": [
+                {
+                    "CHAIN": "DOCKER-USER"
+                },
+                {
+                    "SOURCE": "coredns"
+                },
+                {
+                    "TARGET": "vaultwarden"
+                },
+                {
+                    "TYPE": "udp"
+                },
+                {
+                    "TARGET_PORT": "53"
+                },
+                {
+                    "COMMENT": "dns for vaultwarden"
+                }
+            ],
+            "EXTRA": "--privileged --rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/vaultwarden/firewall-vaultwarden-smtp.json b/vaultwarden/firewall-vaultwarden-smtp.json
new file mode 100644
index 0000000..1b90749
--- /dev/null
+++ b/vaultwarden/firewall-vaultwarden-smtp.json
@@ -0,0 +1,75 @@
+{
+    "main": {
+        "SERVICE_NAME": "firewalls",
+        "DOMAIN": "null"
+    },
+    "containers": [
+        {
+            "IMAGE": "registry.format.hu/firewall",
+            "NAME": "firewall",
+            "MEMORY": "64M",
+            "NETWORK": "host",
+            "SCALE": "0",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/run/",
+                    "DEST": "/run/",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services",
+                    "DEST": "/services",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "ENVS": [
+                {
+                    "CHAIN": "DOCKER-USER"
+                },
+                {
+                    "SOURCE": "vaultwarden"
+                },
+                {
+                    "TARGET": "smtp"
+                },
+                {
+                    "TYPE": "tcp"
+                },
+                {
+                    "TARGET_PORT": "25"
+                },
+                {
+                    "COMMENT": "smtp for vaultwarden"
+                }
+            ],
+            "EXTRA": "--privileged --rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/vaultwarden/service-vaultwarden.json b/vaultwarden/service-vaultwarden.json
index a320b19..7b37826 100644
--- a/vaultwarden/service-vaultwarden.json
+++ b/vaultwarden/service-vaultwarden.json
@@ -1,13 +1,13 @@
 {
     "main": {
-        "SERVICE_NAME": "homeassistant",
-        "DOMAIN": "DOMAIN"
+        "SERVICE_NAME": "vaultwarden",
+        "DOMAIN": "#VAULTWARDEN_DOMAIN"
     },
     "containers": [
         {
             "IMAGE": "alpine:latest",
             "UPDATE": "true",
-            "NAME": "homeassistant-init",
+            "NAME": "vaultwarden-init",
             "NETWORK": "host",
             "MEMORY": "64M",
             "VOLUMES": [
@@ -31,7 +31,7 @@
             "NAME": "vaultwardenmysql-db",
             "MEMORY": "256M",
             "NETWORK": "vaultwarden-net",
-            "SELECTOR": "nextcloudmysql-db",
+            "SELECTOR": "vaultwardenmysql-db",
             "VOLUMES": [
                 {
                     "SOURCE": "/etc/user/data/vaultwarden/db",
@@ -124,8 +124,8 @@
             "POST_START": [
                 "firewall-vaultwarden",
                 "domain-vaultwarden",
-                "dns-vaultwarden",
-                "smtp-vaultwarden"
+                "firewall-vaultwarden-dns",
+                "firewall-vaultwarden-smtp"
             ]
         }
     ]
diff --git a/vaultwarden/template.json b/vaultwarden/template.json
index 84ba97d..3176fc0 100644
--- a/vaultwarden/template.json
+++ b/vaultwarden/template.json
@@ -43,9 +43,9 @@
             "type": "select"
         },
         {
-            "description": "Please add SMTP HOST:",
+            "description": "Please add SMTP hostname (not needed if use global smtp server. In this case keep default and do not fill any other smtp questions):",
             "key": "VAULTWARDEN_SMTP_HOST",
-            "value": "",
+            "value": "smtp",
             "required": "true"
         },
         {