diff --git a/ansible/roles/dotfiles/tasks/dotfiles.yml b/ansible/roles/dotfiles/tasks/dotfiles.yml
index 5c2c6b74..85fd1c75 100644
--- a/ansible/roles/dotfiles/tasks/dotfiles.yml
+++ b/ansible/roles/dotfiles/tasks/dotfiles.yml
@@ -23,5 +23,3 @@
     dest: "{{ ansible_env.HOME}}/{{ item.value }}"
     state: link
   with_dict: ln
-- local_action: command ruby scripts/setup_ssh_keys.rb
-  # when: ansible_domain == "local"
diff --git a/ansible/roles/dotfiles/tasks/main.yml b/ansible/roles/dotfiles/tasks/main.yml
index 4edf2be3..9d58e423 100644
--- a/ansible/roles/dotfiles/tasks/main.yml
+++ b/ansible/roles/dotfiles/tasks/main.yml
@@ -3,3 +3,5 @@
   tags: dotfiles
 - include: powerline.yml
 - include: prezto.yml
+- include: ssh.yml
+  when: ansible_domain == "local"
diff --git a/ansible/roles/dotfiles/tasks/powerline.yml b/ansible/roles/dotfiles/tasks/powerline.yml
index b8b158dd..b001954c 100644
--- a/ansible/roles/dotfiles/tasks/powerline.yml
+++ b/ansible/roles/dotfiles/tasks/powerline.yml
@@ -1,3 +1,10 @@
 ---
 - homebrew: name=python state=present
+  when: ansible_distribution == "MacOSX"
+- apt: name={{ item }} state=present
+  sudo: True
+  with_items:
+    - python
+    - python-pip
+  when: ansible_os_family == "Debian"
 - command: pip install --user -e ~/.dotfiles/src/powerline
diff --git a/ansible/roles/dotfiles/tasks/prezto.yml b/ansible/roles/dotfiles/tasks/prezto.yml
index 01ae6c05..84030001 100644
--- a/ansible/roles/dotfiles/tasks/prezto.yml
+++ b/ansible/roles/dotfiles/tasks/prezto.yml
@@ -1,5 +1,9 @@
 ---
 - homebrew: name=zsh state=present
+  when: ansible_distribution == "MacOSX"
+- apt: name=zsh state=present
+  sudo: True
+  when: ansible_os_family == "Debian"
 - file:
     src: "{{ ansible_env.HOME }}/.dotfiles/src/prezto"
     dest: "{{ ansible_env.HOME}}/.zprezto"
diff --git a/ansible/roles/dotfiles/tasks/ssh.yml b/ansible/roles/dotfiles/tasks/ssh.yml
new file mode 100644
index 00000000..8f009103
--- /dev/null
+++ b/ansible/roles/dotfiles/tasks/ssh.yml
@@ -0,0 +1,8 @@
+---
+- command: >
+    chdir={{ ansible_env.HOME }}/.dotfiles
+    stow --stow --target={{ ansible_env.HOME }} ssh
+  tags: stow
+  when: ansible_domain == "local"
+- local_action: command ruby scripts/setup_ssh_keys.rb
+  when: ansible_domain == "local"
diff --git a/ansible/roles/dotfiles/vars/main.yml b/ansible/roles/dotfiles/vars/main.yml
index b2a6616d..b11ce942 100644
--- a/ansible/roles/dotfiles/vars/main.yml
+++ b/ansible/roles/dotfiles/vars/main.yml
@@ -3,7 +3,6 @@ stow:
   - git
   - pentadactyl
   - ruby
-  - ssh
   - tmux
   - vim
   - osx