diff --git a/roles/service-nginx-firmware/templates/firmware_vhost.conf.j2 b/roles/service-nginx-firmware/templates/firmware_vhost.conf.j2
index a7e87e4..6ff2086 100644
--- a/roles/service-nginx-firmware/templates/firmware_vhost.conf.j2
+++ b/roles/service-nginx-firmware/templates/firmware_vhost.conf.j2
@@ -53,7 +53,7 @@ server {
 
     include /etc/nginx/snippets/letsencrypt-acme-challenge.conf;
 
-    root /var/www/html/firmware/{{ mesh.domain_name.lower() }};
+    root /var/www/html/firmware/{{ mesh.domain_name.lower().rsplit(' ')[0] }};
     location / {
         autoindex on;
         autoindex_exact_size off;
@@ -79,7 +79,7 @@ server {
 
     include /etc/nginx/snippets/letsencrypt-acme-challenge.conf;
 
-    root /var/www/html/firmware/{{ mesh.domain_name.lower() }};
+    root /var/www/html/firmware/{{ mesh.domain_name.lower().rsplit(' ')[0] }};
     location / {
         autoindex on;
         autoindex_exact_size off;