diff --git a/bundles/element-web/items.py b/bundles/element-web/items.py
index 4e2ed3d..42247dd 100644
--- a/bundles/element-web/items.py
+++ b/bundles/element-web/items.py
@@ -29,9 +29,9 @@ files = {
 
 actions = {
     'element-web_yarn': {
-        'command': 'cd ' + element_web_root + ' && yarn install && yarn build',
+        'command': 'cd ' + element_web_root + ' && npm install yarn && node_modules/yarn/bin/yarn install && node_modules/yarn/bin/yarn build',
         'needs': {
-            'pkg_apt:yarn',
+            'pkg_apt:nodejs',
         },
         'triggered': True,
     },
diff --git a/bundles/element-web/metadata.py b/bundles/element-web/metadata.py
index 1846d8d..6b3caf4 100644
--- a/bundles/element-web/metadata.py
+++ b/bundles/element-web/metadata.py
@@ -7,7 +7,6 @@ def nginx_config(metadata):
             'vhosts': {
                 metadata.get('element-web/url'): {
                     'webroot': '/var/www/{}/webapp/'.format(metadata.get('element-web/url')),
-                    'extras': True,
                 },
             },
         },