diff --git a/roles/browsers/tasks/chromium.yml b/roles/browsers/tasks/chromium.yml
new file mode 100644
index 0000000..c81a23d
--- /dev/null
+++ b/roles/browsers/tasks/chromium.yml
@@ -0,0 +1,29 @@
+---
+- name: Install Chromium
+  pacman: name=chromium state=present
+  tags:
+    - chromium
+
+- name: Jail Chromium
+  copy: src=chromium.sh dest=/usr/local/bin/chromium mode=0755
+  tags:
+    - chromium
+    - firejail
+
+- name: Download Chromium Pepper Flash
+  command: cower -dq chromium-pepper-flash
+           chdir=/home/{{ user.name }}/{{ aur.dir }}
+           creates=/home/{{ user.name }}/{{ aur.dir }}/chromium-pepper-flash
+  tags:
+    - aur
+    - chromium
+  become: yes
+  become_user: "{{ user.name }}"
+
+- name: Build and install Chromium Pepper Flash
+  command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/chromium-pepper-flash"
+  tags:
+    - aur
+    - chromium
+  become: yes
+  become_user: "{{ user.name }}"
diff --git a/roles/browsers/tasks/firefox.yml b/roles/browsers/tasks/firefox.yml
new file mode 100644
index 0000000..1ad88d2
--- /dev/null
+++ b/roles/browsers/tasks/firefox.yml
@@ -0,0 +1,11 @@
+---
+- name: Install Firefox
+  pacman: name=firefox state=present
+  tags:
+    - firefox
+
+- name: Jail Firefox
+  copy: src=firefox.sh dest=/usr/local/bin/firefox mode=0755
+  tags:
+    - firefox
+    - firejail
diff --git a/roles/browsers/tasks/main.yml b/roles/browsers/tasks/main.yml
index 8fdf07a..11870ee 100644
--- a/roles/browsers/tasks/main.yml
+++ b/roles/browsers/tasks/main.yml
@@ -5,34 +5,5 @@
 - name: Install w3m
   pacman: name=w3m state=present
 
-- name: Install Firefox
-  pacman: name=firefox state=present
-
-- name: Jail Firefox
-  copy: src=firefox.sh dest=/usr/local/bin/firefox mode=0755
-  tags:
-    - firejail
-
-- name: Install Chromium
-  pacman: name=chromium state=present
-
-- name: Jail Chromium
-  copy: src=chromium.sh dest=/usr/local/bin/chromium mode=0755
-  tags:
-    - firejail
-
-- name: Download Chromium Pepper Flash
-  command: cower -dq chromium-pepper-flash
-           chdir=/home/{{ user.name }}/{{ aur.dir }}
-           creates=/home/{{ user.name }}/{{ aur.dir }}/chromium-pepper-flash
-  tags:
-    - aur
-  become: yes
-  become_user: "{{ user.name }}"
-
-- name: Build and install Chromium Pepper Flash
-  command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/chromium-pepper-flash"
-  tags:
-    - aur
-  become: yes
-  become_user: "{{ user.name }}"
+- include: firefox.yml
+- include: chromium.yml