diff --git a/configs.yml b/configs.yml
index 2a49c7f..721903a 100644
--- a/configs.yml
+++ b/configs.yml
@@ -10,14 +10,6 @@ sudoers:
     - run:
         - sudo chmod 600 /etc/sudoers.d/setup-cockpit
 
-ssh-agent:
-    - symlink:
-        - dotfiles/systemd/ssh-agent.service
-        - ~/.config/systemd/user/ssh-agent.service
-    - run:
-        - systemctl --user is-enabled ssh-agent >/dev/null || systemctl --user enable ssh-agent;
-          systemctl --user start ssh-agent
-
 pacman.conf:
     - run:
         command: sudo cp /etc/pacman.conf /etc/pacman.conf.backup
diff --git a/playbook.yml b/playbook.yml
index 64e3feb..d353e64 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -4,3 +4,4 @@
   roles:
     - base
     - neovim
+    - ssh-agent
diff --git a/dotfiles/systemd/ssh-agent.service b/roles/ssh-agent/files/ssh-agent.service
similarity index 100%
rename from dotfiles/systemd/ssh-agent.service
rename to roles/ssh-agent/files/ssh-agent.service
diff --git a/roles/ssh-agent/tasks/main.yml b/roles/ssh-agent/tasks/main.yml
new file mode 100644
index 0000000..7258516
--- /dev/null
+++ b/roles/ssh-agent/tasks/main.yml
@@ -0,0 +1,13 @@
+---
+
+- name: Copy ssh-agent.service
+  copy:
+    src: ssh-agent.service
+    dest: ~/.config/systemd/user/ssh-agent.service
+
+- name: Enable ssh-agent service
+  systemd:
+    name: ssh-agent
+    enabled: true
+    state: started
+    scope: user