diff --git a/mastodon.yml b/mastodon.yml
index 296e9b0..1173143 100644
--- a/mastodon.yml
+++ b/mastodon.yml
@@ -4,4 +4,7 @@
   hosts: mastodonservers
   diff: true
   roles:
+    - nodejs
+    - yarn
+    - redis
     - mastodon
diff --git a/roles/mastodon/tasks/main.yml b/roles/mastodon/tasks/main.yml
index de55102..321a68d 100644
--- a/roles/mastodon/tasks/main.yml
+++ b/roles/mastodon/tasks/main.yml
@@ -1,14 +1,5 @@
 ---
 
-- name: Install nodejs
-  ansible.builtin.include_tasks: nodejs.yml
-
-- name: Install yarn
-  ansible.builtin.include_tasks: yarn.yml
-
-- name: Install redis
-  ansible.builtin.include_tasks: redis.yml
-
 - name: Create mastodon user
   ansible.builtin.user:
     name: mastodon
diff --git a/roles/mastodon/tasks/nodejs.yml b/roles/nodejs/tasks/main.yml
similarity index 60%
rename from roles/mastodon/tasks/nodejs.yml
rename to roles/nodejs/tasks/main.yml
index 71dacf3..72089ac 100644
--- a/roles/mastodon/tasks/nodejs.yml
+++ b/roles/nodejs/tasks/main.yml
@@ -2,19 +2,19 @@
 
 - name: Get node source gpg url
   ansible.builtin.get_url:
-    url: "{{ mastodon_nodejs_key_url }}"
+    url: "{{ nodejs_key_url }}"
     dest: /tmp/nodesource.gpg.key
     force: true
     mode: 0644
 
 - name: Dearmor gpg key
   ansible.builtin.command:
-    cmd: "gpg --dearmor --yes -o {{ mastodon_nodejs_key_path }} /tmp/nodesource.gpg.key"
+    cmd: "gpg --dearmor --yes -o {{ nodejs_key_path }} /tmp/nodesource.gpg.key"
   changed_when: true
 
 - name: Set node source repo
   ansible.builtin.copy:
-    content: "deb [signed-by={{ mastodon_nodejs_key_path }}] https://deb.nodesource.com/node_16.x {{ ansible_facts['distribution_release'] }} main"
+    content: "deb [signed-by={{ nodejs_key_path }}] https://deb.nodesource.com/node_16.x {{ ansible_facts['distribution_release'] }} main"
     dest: /etc/apt/sources.list.d/nodesource.list
     mode: 0644
 
diff --git a/roles/nodejs/vars/main.yml b/roles/nodejs/vars/main.yml
new file mode 100644
index 0000000..d52323c
--- /dev/null
+++ b/roles/nodejs/vars/main.yml
@@ -0,0 +1,4 @@
+---
+
+nodejs_key_url: "https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
+nodejs_key_path: "/usr/share/keyrings/nodesource.gpg"
diff --git a/roles/mastodon/tasks/redis.yml b/roles/redis/tasks/main.myl
similarity index 100%
rename from roles/mastodon/tasks/redis.yml
rename to roles/redis/tasks/main.myl
diff --git a/roles/mastodon/tasks/yarn.yml b/roles/yarn/tasks/main.yml
similarity index 64%
rename from roles/mastodon/tasks/yarn.yml
rename to roles/yarn/tasks/main.yml
index f662845..6db3d2b 100644
--- a/roles/mastodon/tasks/yarn.yml
+++ b/roles/yarn/tasks/main.yml
@@ -2,19 +2,19 @@
 
 - name: Get yarn gpg url
   ansible.builtin.get_url:
-    url: "{{ mastodon_yarn_key_url }}"
+    url: "{{ yarn_key_url }}"
     dest: /tmp/yarn.gpg.key
     mode: 0644
     force: true
 
 - name: Dearmor gpg key
   ansible.builtin.command:
-    cmd: "gpg --dearmor --yes -o {{ mastodon_yarn_key_path }} /tmp/yarn.gpg.key"
+    cmd: "gpg --dearmor --yes -o {{ yarn_key_path }} /tmp/yarn.gpg.key"
   changed_when: true
 
 - name: Set yarn source repo
   ansible.builtin.copy:
-    content: "deb [signed-by={{ mastodon_yarn_key_path }}] https://dl.yarnpkg.com/debian stable main"
+    content: "deb [signed-by={{ yarn_key_path }}] https://dl.yarnpkg.com/debian stable main"
     dest: /etc/apt/sources.list.d/yarn.list
     mode: 0644
 
diff --git a/roles/yarn/vars/main.yml b/roles/yarn/vars/main.yml
new file mode 100644
index 0000000..632dd82
--- /dev/null
+++ b/roles/yarn/vars/main.yml
@@ -0,0 +1,4 @@
+---
+
+yarn_key_url: "https://dl.yarnpkg.com/debian/pubkey.gpg"
+yarn_key_path: "/usr/share/keyrings/yarnkey.gpg"