diff --git a/TODO b/TODO
index 2d5d0e4..9d22e65 100644
--- a/TODO
+++ b/TODO
@@ -35,6 +35,5 @@
 - fish role is ugly
 
 #TEST
-- repair travis runs
 - wf-recorder
 - systemctl pager is fucked, still ?
diff --git a/roles/ssh-agent/handlers/main.yml b/roles/ssh-agent/handlers/main.yml
new file mode 100644
index 0000000..ce808bf
--- /dev/null
+++ b/roles/ssh-agent/handlers/main.yml
@@ -0,0 +1,8 @@
+---
+- name: enable ssh-agent                  
+  systemd:
+    name: ssh-agent
+    daemon_reload: yes
+    enabled: yes
+    scope: user
+  when: ansible_virtualization_role == "host"
diff --git a/roles/ssh-agent/tasks/main.yml b/roles/ssh-agent/tasks/main.yml
index da73b39..b93556d 100644
--- a/roles/ssh-agent/tasks/main.yml
+++ b/roles/ssh-agent/tasks/main.yml
@@ -3,15 +3,9 @@
   copy:
     src: ssh-agent.service
     dest: ~/.config/systemd/user/
+  notify: enable ssh-agent
 
 - name: Configure pam environment
   copy:
     src: pam_environment
     dest: ~/.pam_environment
-
-- name: Start and enable ssh-agent service
-  systemd:
-    name: ssh-agent
-    state: started
-    enabled: yes
-    scope: user