diff --git a/hosts b/hosts
index a38a968..cd0d23d 100644
--- a/hosts
+++ b/hosts
@@ -1,6 +1,4 @@
 [new-office]
-natural-flavours
-#.csclub.uwaterloo.ca
 
 [general-use]
 caffeine.csclub.uwaterloo.ca
@@ -8,6 +6,8 @@ corn-syrup.csclub.uwaterloo.ca
 hfcs.csclub.uwaterloo.ca
 sucrose.csclub.uwaterloo.ca
 taurine.csclub.uwaterloo.ca
+caffeine-00.csclub.uwaterloo.ca
+caffeine-01.csclub.uwaterloo.ca
 
 [office]
 bit-shifter.csclub.uwaterloo.ca
@@ -29,6 +29,9 @@ munin.csclub.uwaterloo.ca
 rt.csclub.uwaterloo.ca
 netbox.csclub.uwaterloo.ca
 sodium-benzoate.csclub.uwaterloo.ca
+yerba-mate.csclub.uwaterloo.ca
+guayusa.csclub.uwaterloo.ca
+sandstorm.csclub.uwaterloo.ca
 
 [audio-sink]
 nullsleep.csclub.uwaterloo.ca
diff --git a/install-general-use-container.yml b/install-general-use-container.yml
new file mode 100644
index 0000000..6f3cba2
--- /dev/null
+++ b/install-general-use-container.yml
@@ -0,0 +1,14 @@
+---
+  - hosts: caffeine-00.csclub.uwaterloo.ca
+    become: yes
+    become_method: sudo
+    roles:
+      - common
+      - core
+      - devel
+      - generate-hosts
+      - auth
+      - csc-packages
+      - general-use
+      - ipv6-disable-ra-privacy
+      - cleanup
diff --git a/install-syscom.yml b/install-syscom.yml
index d7fece4..2e6a9cb 100644
--- a/install-syscom.yml
+++ b/install-syscom.yml
@@ -1,5 +1,5 @@
 ---
- -  hosts: sodium-benzoate.csclub.uwaterloo.ca
+ -  hosts: yerba-mate.csclub.uwaterloo.ca guayusa.csclub.uwaterloo.ca
     become: yes
     become_method: sudo
     roles:
diff --git a/roles/devel/tasks/main.yml b/roles/devel/tasks/main.yml
index 1f2ae66..72ac274 100644
--- a/roles/devel/tasks/main.yml
+++ b/roles/devel/tasks/main.yml
@@ -58,7 +58,6 @@
         - elfutils
         - valgrind
         - libc6-dbg
-        - bashdb
 
 -   name: Install interpreters
     apt: name={{ item }} state=latest
@@ -110,6 +109,7 @@
         - git-arch
         - git-doc
         - git-buildpackage
+        - git-lfs
         - mercurial
         - subversion
         - subversion-tools
@@ -126,7 +126,12 @@
         - gitk
         - git-gui
         - diffutils
+
+-   name: Install VCS (Ubuntu)
+    apt: name={{ item }} state=latest
+    with_items:
         - tkdiff
+    when: ansible_distribution == "Ubuntu"
 
 -   name: Install mono
     apt: name={{ item }} state=latest
@@ -258,10 +263,21 @@
         - erlang-dev
         - beef
         - intercal
-        - php-cli
         - rhino
         - sbcl
 
+-   name: Install misc languages on Ubuntu
+    apt: name={{ item }} state=latest
+    with_items:
+        - php-cli
+    when: ansible_distribution == 'Ubuntu'
+
+-   name: Install misc languages on Debian
+    apt: name={{ item }} state=latest
+    with_items:
+        - php5-cli
+    when: ansible_distribution == 'Debian'
+
 -   name: Install AVR tools
     apt: name={{ item }} state=latest
     with_items:
@@ -293,7 +309,6 @@
         - libapt-pkg-dev
         - linux-libc-dev
         - libkrb5-dev
-        - libgnutls-dev
         - libreadline-dev
         - libncurses5-dev
         - libncursesw5-dev
@@ -330,6 +345,12 @@
         - libmpc-dev
         - libfplll-dev
 
+-   name: Install misc libs on Ubuntu
+    apt: name={{ item }} state=latest
+    with_items:
+        - libgnutls-dev
+    when: ansible_distribution == 'Ubuntu'
+
 -   name: Install x11 libs
     apt: name={{ item }} state=latest
     with_items:
@@ -362,6 +383,7 @@
         - gcc-5-powerpc-linux-gnu
         - gcc-5-sparc64-linux-gnu
         - gcc-5-s390x-linux-gnu
+    when: ansible_distribution == 'Ubuntu'
 
 -   name: Install misc dev tools
     apt: name={{ item }} state=latest
diff --git a/roles/general-use-gui/files/chrome-kerberos.json b/roles/general-use-gui/files/chrome-kerberos.json
new file mode 100644
index 0000000..d92ca7c
--- /dev/null
+++ b/roles/general-use-gui/files/chrome-kerberos.json
@@ -0,0 +1,3 @@
+{
+   "AuthServerWhitelist": "*.csclub.uwaterloo.ca"
+}
diff --git a/roles/general-use-gui/files/firefox-kerberos.js b/roles/general-use-gui/files/firefox-kerberos.js
new file mode 100644
index 0000000..3615052
--- /dev/null
+++ b/roles/general-use-gui/files/firefox-kerberos.js
@@ -0,0 +1,5 @@
+// This file can be used to configure global preferences for Firefox
+// Example: Homepage
+//pref("browser.startup.homepage", "http://www.weebls-stuff.com/wab/");
+
+pref("network.negotiate-auth.trusted-uris", ".csclub.uwaterloo.ca");
diff --git a/roles/general-use-gui/tasks/main.yml b/roles/general-use-gui/tasks/main.yml
index 94adfdf..c5d5969 100644
--- a/roles/general-use-gui/tasks/main.yml
+++ b/roles/general-use-gui/tasks/main.yml
@@ -38,8 +38,8 @@
 - name: copy chrome managed policy
   copy: src={{ item.src }} dest={{ item.dest }} backup=no
   with_items:
-    - { src: 'web-kerberos/chrome.json', dest: '/etc/opt/chrome/policies/managed/csc-kerberos.json' }
-    - { src: 'web-kerberos/firefox.js', dest: '/etc/firefox/syspref.js' }
+    - { src: 'chrome-kerberos.json', dest: '/etc/opt/chrome/policies/managed/csc-kerberos.json' }
+    - { src: 'firefox-kerberos.js', dest: '/etc/firefox/syspref.js' }
 
 -   name: Install Mail Clients
     apt: name={{ item }} state=latest
diff --git a/roles/general-use/tasks/main.yml b/roles/general-use/tasks/main.yml
index 4bbf687..6409c45 100644
--- a/roles/general-use/tasks/main.yml
+++ b/roles/general-use/tasks/main.yml
@@ -103,6 +103,7 @@
         - maxima-doc
         - fplll-tools
         - gnuplot-nox
+        - coq
 
 
 -   name: Install xml tools
@@ -128,7 +129,6 @@
     apt: name={{ item }} state=latest
     with_items:
         - festival
-        - ffmpeg
         - dvgrab
         - cdparanoia
         - genisoimage
@@ -137,17 +137,30 @@
         - x264
         - mkvtoolnix
         - vorbis-tools
-        - mencoder
         - timidity
         - dvd+rw-tools
         - lame
         - twolame
         - cdrdao
-        - dvdrip
         - wodim
         - pulseaudio
         - bchunk
 
+-   name: Install multimedia tools on Ubuntu
+    apt: name={{ item }} state=latest
+    with_items:
+        - mencoder
+        - dvdrip
+        - ffmpeg
+    when: ansible_distribution == 'Ubuntu'
+
+-   name: Install multimedia tools on Debian
+    apt: name={{ item }} state=latest
+    with_items:
+        - libav-tools
+    when: ansible_distribution == 'Debian'
+
+
 -   name: Install torrent tools
     apt: name={{ item }} state=latest
     with_items:
diff --git a/update-hosts.yml b/update-hosts.yml
index 7e3ca69..8c0cf90 100644
--- a/update-hosts.yml
+++ b/update-hosts.yml
@@ -1,12 +1,18 @@
 ---
 - hosts: all
-  remote_user: root
+  become: yes
+  become_method: sudo
   tasks:
      - name: update hosts
        connection: local
-       git: repo=~git/public/hosts.git dest=generate-hosts-{{ ansible_hostname }}
+       git: repo=~git/public/hosts.git dest=/tmp/generate-hosts-{{ ansible_hostname }}
      - name: generate hosts file
        connection: local
-       shell: generate-hosts-{{ ansible_hostname }}/generate-hosts.py < generate-hosts-{{ ansible_hostname }}/hosts.in > generate-hosts-{{ ansible_hostname }}/hosts
+       shell: /tmp/generate-hosts-{{ ansible_hostname }}/generate-hosts.py < /tmp/generate-hosts-{{ ansible_hostname }}/hosts.in > /tmp/generate-hosts-{{ ansible_hostname }}/hosts
      - name: copy hosts file
-       copy: src=generate-hosts-{{ ansible_hostname }}/hosts dest=/etc/hosts backup=yes
+       copy: src=/tmp/generate-hosts-{{ ansible_hostname }}/hosts dest=/etc/hosts backup=no
+     - name: etckeeper commit
+       command: etckeeper commit "Update /etc/hosts with ansible"
+     - name: delete local copy
+       connection: local
+       command: rm -rf /tmp/generate-hosts-{{ ansible_hostname }}