diff --git a/configs.yml b/configs.yml
index acdfbd9..83b2a43 100644
--- a/configs.yml
+++ b/configs.yml
@@ -64,13 +64,6 @@ pass:
           sudo cp /usr/bin/passmenu /usr/bin/passmenu-user &&
           sudo sed -i "s/pass show -c/pass show -c3/g" /usr/bin/passmenu-user
 
-keepass:
-    - install:
-        - keepassxc
-    - clone:
-        - git@tunuifranken.info:flyingscorpio/keepass.git
-        - ~/keepass
-
 protonvpn:
     - install:
         - openvpn
diff --git a/playbook.yml b/playbook.yml
index 104d489..25c1c9f 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -12,6 +12,8 @@
       tags: zsh
     - role: kitty
       tags: kitty
+    - role: keepass
+      tags: keepass
     - role: terminator
       tags: terminator
     - role: neovim
diff --git a/roles/keepass/tasks/main.yml b/roles/keepass/tasks/main.yml
new file mode 100644
index 0000000..919df56
--- /dev/null
+++ b/roles/keepass/tasks/main.yml
@@ -0,0 +1,21 @@
+---
+
+- name: Install keepass (Archlinux)
+  become: true
+  pacman:
+    name:
+      - keepassxc
+  when: ansible_distribution == 'Archlinux'
+
+- name: Install keepass (Debian)
+  become: true
+  apt:
+    name:
+      - keepassxc
+  when: ansible_distribution == 'Debian'
+
+- name: Clone keepass repo
+  git:
+    repo: git@tunuifranken.info:flyingscorpio/keepass.git
+    dest: ~/keepass
+    clone: yes