diff --git a/roles/matrix-base/tasks/server_base/setup.yml b/roles/matrix-base/tasks/server_base/setup.yml
index 45feb152..7cb716a9 100644
--- a/roles/matrix-base/tasks/server_base/setup.yml
+++ b/roles/matrix-base/tasks/server_base/setup.yml
@@ -4,7 +4,10 @@
   when: ansible_distribution == 'CentOS'
 
 - include_tasks: "{{ role_path }}/tasks/server_base/setup_debian.yml"
-  when: ansible_os_family == 'Debian'
+     when: (ansible_os_family == 'Debian') and (ansible_lsb.id != 'Raspbian') 
+
+- include_tasks: "{{ role_path }}/tasks/server_base/setup_raspbian.yml"
+     when: (ansible_os_family == 'Debian') and (ansible_lsb.id == 'Raspbian') 
 
 - name: Ensure Docker is started and autoruns
   service: