diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index a58e3bc4..b4fef1dd 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -66,6 +66,3 @@ run_setup: true
 run_self_check: true
 run_start: true
 run_stop: true
-
-# Raspberry pi depoly TODO: it should be identified based on the operating system
-matrix_raspberry_pi_deploy: false
\ No newline at end of file
diff --git a/roles/matrix-base/tasks/server_base/setup.yml b/roles/matrix-base/tasks/server_base/setup.yml
index 1ce62158..70b2e4fc 100644
--- a/roles/matrix-base/tasks/server_base/setup.yml
+++ b/roles/matrix-base/tasks/server_base/setup.yml
@@ -7,7 +7,7 @@
   when: (ansible_os_family == 'Debian') and (ansible_lsb.id != 'Raspbian') 
 
 - include_tasks: "{{ role_path }}/tasks/server_base/setup_raspbian.yml"
-  when: "matrix_raspberry_pi_deploy" 
+  when: (ansible_os_family == 'Debian') and (ansible_lsb.id == 'Raspbian') 
 
 - name: Ensure Docker is started and autoruns
   service: