diff --git a/playbooks/Linux.yaml b/playbooks/Linux.yaml
index d4b9b54..d5186bd 100644
--- a/playbooks/Linux.yaml
+++ b/playbooks/Linux.yaml
@@ -3,10 +3,11 @@
 - import_playbook: UnixGUI.yaml
 - hosts: localhost
   roles:
+    - role: firefox
+    - role: kitty
     - role: cider
     - role: gnome-tweaks
       when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
-    - role: kitty
     - role: xremap
       when: >
         'GNOME' in ansible_env.XDG_CURRENT_DESKTOP and
diff --git a/roles/firefox/tasks/Ubuntu.yaml b/roles/firefox/tasks/Ubuntu.yaml
new file mode 100644
index 0000000..e5af090
--- /dev/null
+++ b/roles/firefox/tasks/Ubuntu.yaml
@@ -0,0 +1,51 @@
+---
+- name: remove snap package
+  become: true
+  snap:
+    name: firefox
+    state: absent
+
+- name: create keyrings directory
+  become: true
+  file:
+    path: /etc/apt/keyrings
+    mode: '755'
+    state: directory
+
+- name: install mozilla repo keyring
+  become: true
+  get_url:
+    url: https://packages.mozilla.org/apt/repo-signing-key.gpg
+    dest: /etc/apt/keyrings/packages.mozilla.org.asc
+
+- name: add mozilla apt repo
+  become: true
+  copy:
+    content: >-
+      deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc]
+      https://packages.mozilla.org/apt mozilla main
+    dest: /etc/apt/sources.list.d/mozilla.list
+
+- name: pin mozilla package
+  become: true
+  copy:
+    content: |
+      Package: *
+      Pin: origin packages.mozilla.org
+      Pin-Priority: 1000
+    dest: /etc/apt/preferences.d/mozilla
+
+- name: install mozilla package
+  become: true
+  apt:
+    name: firefox
+    state: latest
+    allow_downgrade: true
+    update_cache: true
+
+- name: install gnome shell integration
+  when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
+  become: true
+  apt:
+    name: chrome-gnome-shell
+    state: latest
diff --git a/roles/firefox/tasks/main.yaml b/roles/firefox/tasks/main.yaml
index 6853678..7a1fa8b 100644
--- a/roles/firefox/tasks/main.yaml
+++ b/roles/firefox/tasks/main.yaml
@@ -1,2 +1,5 @@
 ---
-- include_tasks: '{{ansible_os_family}}.yaml'
+- include_tasks: Windows.yaml
+  when: ansible_os_family == 'Windows'
+- include_tasks: Ubuntu.yaml
+  when: ansible_distribution == 'Ubuntu'