diff --git a/README.md b/README.md
index 86b26ce..263a733 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Should not be used as ``root``.
 
 #### Dependencies
 
-- ansible >= 2.4
+- ansible >= 2.7
 
 #### Role list
 
@@ -81,7 +81,7 @@ It could be run as ``root``.
 
 #### Dependencies
 
-- ansible >= 2.4
+- ansible >= 2.7
 
 #### Role list
 
diff --git a/roles/ssh-agent/files/pam_environment b/roles/ssh-agent/files/pam_environment
new file mode 100644
index 0000000..3bd1a97
--- /dev/null
+++ b/roles/ssh-agent/files/pam_environment
@@ -0,0 +1 @@
+SSH_AUTH_SOCK DEFAULT="${XDG_RUNTIME_DIR}/ssh-agent.socket"
diff --git a/roles/ssh-agent/files/ssh-add.sh b/roles/ssh-agent/files/ssh-add.sh
deleted file mode 100644
index 2b15a01..0000000
--- a/roles/ssh-agent/files/ssh-add.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-eval $(ssh-agent)
-ssh-add &
diff --git a/roles/ssh-agent/files/ssh-agent.service b/roles/ssh-agent/files/ssh-agent.service
new file mode 100644
index 0000000..9428410
--- /dev/null
+++ b/roles/ssh-agent/files/ssh-agent.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH key agent
+
+[Service]
+Type=simple
+Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
+ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
+
+[Install]
+WantedBy=default.target
diff --git a/roles/ssh-agent/tasks/main.yml b/roles/ssh-agent/tasks/main.yml
index 651f82f..da73b39 100644
--- a/roles/ssh-agent/tasks/main.yml
+++ b/roles/ssh-agent/tasks/main.yml
@@ -1,5 +1,17 @@
 ---
 - name: Configure ssh-agent
   copy:
-    src: ssh-add.sh
-    dest: ~/.xprofile.d/
+    src: ssh-agent.service
+    dest: ~/.config/systemd/user/
+
+- 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 
diff --git a/roles/sway/TODO b/roles/sway/TODO
new file mode 100644
index 0000000..6455926
--- /dev/null
+++ b/roles/sway/TODO
@@ -0,0 +1,7 @@
+- variety
+- systray
+- waybar
+- move to screen bug
+- look des apps Qt
+- autostart sway at login tty1
+- Wofi focusing on current screen
diff --git a/roles/sway/templates/by_host/osz/config.j2 b/roles/sway/templates/by_host/osz/config.j2
index 0b39093..001b59d 100644
--- a/roles/sway/templates/by_host/osz/config.j2
+++ b/roles/sway/templates/by_host/osz/config.j2
@@ -32,5 +32,5 @@ exec --no-startup-id swaymsg 'exec variety &'
 exec --no-startup-id swaymsg 'exec google-chrome-stable'
 exec --no-startup-id swaymsg 'exec google-chrome-stable --app="https://gmail.com"'
 exec --no-startup-id swaymsg 'workspace $tag4; exec termite -e "screen -rd weechat &"'
-exec --no-startup-id swaymsg 'workspace $tag2; exec termite -e "ssh-add"'
+exec --no-startup-id swaymsg 'workspace $tag2; exec termite -e "ssh-add" && termite'
 #INCLUDE####################################################
diff --git a/roles/sway/templates/config.j2 b/roles/sway/templates/config.j2
index 81f432d..9c7cae4 100644
--- a/roles/sway/templates/config.j2
+++ b/roles/sway/templates/config.j2
@@ -20,7 +20,6 @@ smart_gaps on
 gaps inner 4
 gaps outer -4
 
-
 # start a terminal
 bindsym $mod+Return exec termite