diff --git a/roles/_meta/deploy-drupal10/tasks/main.yml b/roles/_meta/deploy-drupal10/tasks/main.yml
index 6b0d86ab..91ea32e8 100644
--- a/roles/_meta/deploy-drupal10/tasks/main.yml
+++ b/roles/_meta/deploy-drupal10/tasks/main.yml
@@ -7,8 +7,6 @@
     name: deploy_code
 - ansible.builtin.import_role:
     name: composer
-- ansible.builtin.import_role:
-    name: npm
 - ansible.builtin.import_role:
     name: maintenance_mode
   vars:
@@ -24,6 +22,8 @@
     name: database_apply
 - ansible.builtin.import_role:
     name: sanitize/admin_creds
+- ansible.builtin.import_role:
+    name: npm
 - ansible.builtin.import_role:
     name: live_symlink
 - ansible.builtin.import_role:
diff --git a/roles/_meta/deploy-drupal7/tasks/main.yml b/roles/_meta/deploy-drupal7/tasks/main.yml
index cecf3ea0..12970652 100644
--- a/roles/_meta/deploy-drupal7/tasks/main.yml
+++ b/roles/_meta/deploy-drupal7/tasks/main.yml
@@ -7,8 +7,6 @@
     name: _init
 - import_role:
     name: deploy_code
-- import_role:
-    name: npm
 - import_role:
     name: maintenance_mode
   vars:
@@ -24,6 +22,8 @@
     name: sanitize/admin_creds
 - import_role:
     name: live_symlink
+- import_role:
+    name: npm
 - import_role:
     name: cache_clear/cache_clear-opcache
 - import_role:
diff --git a/roles/_meta/deploy-drupal8/tasks/main.yml b/roles/_meta/deploy-drupal8/tasks/main.yml
index c8a9223b..ce671f84 100644
--- a/roles/_meta/deploy-drupal8/tasks/main.yml
+++ b/roles/_meta/deploy-drupal8/tasks/main.yml
@@ -9,8 +9,6 @@
     name: deploy_code
 - ansible.builtin.import_role:
     name: composer
-- ansible.builtin.import_role:
-    name: npm
 - ansible.builtin.import_role:
     name: maintenance_mode
   vars:
@@ -26,6 +24,8 @@
     name: database_apply
 - ansible.builtin.import_role:
     name: sanitize/admin_creds
+- ansible.builtin.import_role:
+    name: npm
 - ansible.builtin.import_role:
     name: live_symlink
 - ansible.builtin.import_role:
diff --git a/roles/npm/tasks/main.yml b/roles/npm/tasks/main.yml
index 40fe0813..5a77001a 100644
--- a/roles/npm/tasks/main.yml
+++ b/roles/npm/tasks/main.yml
@@ -17,10 +17,10 @@
         msg: "{{ item.npm_command }} >>> rc={{ item.rc }}, stdout={{ item.stdout }}"
       loop: "{{ _npm_results.results }}"
 
-    - name: Run extra drush commands from webroot.
+    - name: Run extra drush commands from the first site's dir.
       ansible.builtin.command:
         cmd: "{{ drush_bin }} {{ extra_drush_command }}"
-        chdir: "{{ deploy_path }}/{{ webroot }}"
+        chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ drupal.sites[0].folder }}"
       with_items: "{{ npm.extra_drush_commands }}"
       loop_control:
         loop_var: extra_drush_command