diff --git a/roles/neovim/tasks/main.yml b/roles/neovim/tasks/main.yml
index a2ce10b..08fba5b 100644
--- a/roles/neovim/tasks/main.yml
+++ b/roles/neovim/tasks/main.yml
@@ -6,6 +6,8 @@
   failed_when: init_vim.stat.exists
 
 - name: Install (Archlinux)
+  when:
+    ansible_facts['distribution'] == 'Archlinux'
   block:
     - name: Install things with pacman (Archlinux)
       become: true
@@ -37,10 +39,10 @@
       with_items:
         - '@ansible/ansible-language-server'
         - diagnostic-languageserver
-  when:
-    ansible_facts['distribution'] == 'Archlinux'
 
 - name: Install (Debian)
+  when:
+    ansible_facts['distribution'] == 'Debian'
   block:
     - name: Find latest neovim version
       uri:
@@ -94,8 +96,6 @@
         # TODO:
         # - lua-language-server
         # - texlab
-  when:
-    ansible_facts['distribution'] == 'Debian'
 
 - name: Grab marksman (LSP server) binary
   block: