diff --git a/vars/CentOS.yml b/vars/CentOS.yml
index 305c37d83..da61b8a60 100644
--- a/vars/CentOS.yml
+++ b/vars/CentOS.yml
@@ -1,9 +1,5 @@
-is_debian: false
-is_debuntu: false
-is_ubuntu: false
-is_centos: true
-is_fedora: false
-is_redhat: true
+is_centos: True
+is_redhat: True
 dns_service: named
 dns_user: named
 proxy: squid
diff --git a/vars/Debian.yml b/vars/Debian.yml
index 1d2363cc8..8b75d5a54 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,9 +1,5 @@
-is_debian: true
-is_debuntu: true
-is_ubuntu: false
-is_redhat: false
-is_fedora: False
-is_centos: false
+is_debian: True
+is_debuntu: True
 dns_service: bind9
 dns_user: bind
 proxy: squid3
diff --git a/vars/Fedora.yml b/vars/Fedora.yml
index c6b9aabde..20c66d001 100644
--- a/vars/Fedora.yml
+++ b/vars/Fedora.yml
@@ -1,7 +1,4 @@
-is_debian: false
-is_debuntu: false
-is_centos: false
-is_redhat: true
+is_redhat: True
 dns_service: named
 dns_user: named
 proxy: squid
diff --git a/vars/OLPC.yml b/vars/OLPC.yml
index 2b79c60d9..b3f08c384 100644
--- a/vars/OLPC.yml
+++ b/vars/OLPC.yml
@@ -1,7 +1,4 @@
-is_debian: false
-is_debuntu: false
-is_centos: false
-is_redhat: true
+is_redhat: True
 dns_service: named
 dns_user: named
 proxy: squid
diff --git a/vars/Raspbian.yml b/vars/Raspbian.yml
new file mode 100644
index 000000000..68d116806
--- /dev/null
+++ b/vars/Raspbian.yml
@@ -0,0 +1,25 @@
+is_rpi: True
+is_debian: True
+is_debuntu: True
+
+dns_service: bind9
+dns_user: bind
+proxy: squid3
+proxy_user: proxy
+apache_service: apache2
+apache_user: apache
+apache_config_dir: apache2/sites-available
+apache_data: www-data
+apache_log_dir: /var/log/apache2
+smb_service: smbd
+nmb_service: nmbd
+kalite_program: /usr/local/bin/kalite
+systemctl_program: /bin/systemctl
+mysql_service: mysql
+apache_log: /var/log/apache2/access.log
+# cups lp module not available in raspbian, causes systemd-modueles-load to fail
+# which in turn cause netfilter-persistent to fail, which is essential
+cups_install: True
+sshd_service: ssh
+php_version: 5
+postgresql_version: 9.4
diff --git a/vars/Ubuntu.yml b/vars/Ubuntu.yml
index 853c63f79..7bf71acf1 100644
--- a/vars/Ubuntu.yml
+++ b/vars/Ubuntu.yml
@@ -1,8 +1,5 @@
-is_debuntu: true
-is_ubuntu: true
-is_debian: false
-is_redhat: false
-is_fedora: false
+is_debuntu: True
+is_ubuntu: True
 dns_service: bind9
 dns_user: bind
 proxy: squid
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 5a5845315..703be8007 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -43,7 +43,7 @@ local_tz: "{{lookup ('env','TZ') }}"
 
 # Network Parameters
 
-xsce_hostname: schoolserver
+xsce_hostname: box
 xsce_domain: lan
 lan_ip: 172.18.96.1
 lan_netmask: 255.255.224.0
@@ -307,3 +307,13 @@ xovis_backup_dir: "/library/users"
 xovis_chart_heading: "My School: Usage Data Visualization"
 
 # 9-LOCAL-ADDONS
+
+# Platforms - turn all off and let <OS>.yml turn on as appropriate
+
+is_rpi: true
+is_debian: False
+is_debuntu: False
+is_ubuntu: False
+is_redhat: False
+is_fedora: False
+is_centos: False