diff --git a/ansible/irregular-apocalypse.yml b/ansible/irregular-apocalypse.yml
index 0b7e3fcc..ce7094d1 100644
--- a/ansible/irregular-apocalypse.yml
+++ b/ansible/irregular-apocalypse.yml
@@ -15,7 +15,10 @@
         update_cache: yes
       with_items:
         - make
+        - mosh
+        - libterm-readkey-perl
         - python-pip
+        - software-properties-common
         - zsh
       become: yes
 
@@ -25,24 +28,34 @@
     - zsh
 
 - hosts: all
+  name: install Ansible
   tasks:
-    - stat: path=/usr/bin/local/chruby-exec
+    - apt_repository:
+        repo: ppa:ansible/ansible
+      become: yes
+    - apt:
+        name: ansible
+        update_cache: yes
+      become: yes
+
+- hosts: all
+  name: install Ruby
+  tasks:
+    - stat: path=/usr/local/bin/chruby-exec
       register: chruby
     - import_tasks: irregular-apocalypse/chruby.yml
       vars:
         version: 0.3.9
       when: chruby.stat.exists == False
 
-- hosts: all
-  tasks:
     - stat: path=/usr/bin/local/ruby-install
       register: ruby_install
     - import_tasks: irregular-apocalypse/ruby-install.yml
       vars:
         version: 0.6.1
-      when: ruby_install.stat.exists == True
+      when: ruby_install.stat.exists == False
 
-- hosts: all
-  tasks:
-    - name: install Ruby
-      command: ruby-install ruby
+    - stat: path=~/.rubies
+      register: rubies
+    - command: ruby-install ruby
+      when: rubies.stat.exists == False