diff --git a/group_vars/all.yml b/group_vars/all.yml
index 39d4dcd..11b64e2 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -17,6 +17,7 @@ aur_helper: yay
 packages:
   - base-devel
   - curl
+  - direnv
   - docker
   - docker-compose
   - e2fsprogs
@@ -24,6 +25,7 @@ packages:
   - firefox
   - flatpak
   - git
+  - github-cli
   - gnupg
   - htop
   - inetutils
@@ -42,7 +44,10 @@ packages:
   - rbw
   - rsync
   - screen
+  - stow
   - sudo
+  - tea
+  - the_silver_searcher
   - tilix
   - tree
   - unrar-free
@@ -54,6 +59,7 @@ packages:
   - zsh
 
 aur_packages:
+  - antidote
   - gohugo-extended-bin
   - gnome-extensions-cli
 
diff --git a/roles/07_user/files/rbw-config.json b/roles/07_user/files/rbw-config.json
new file mode 100644
index 0000000..37f8a78
--- /dev/null
+++ b/roles/07_user/files/rbw-config.json
@@ -0,0 +1,10 @@
+{
+    "email": "ariejan@devroom.io",
+    "base_url": "https://bitwarden.devroom.io",
+    "identity_url": null,
+    "notifications_url": null,
+    "lock_timeout": 3600,
+    "sync_interval": 3600,
+    "pinentry": "pinentry",
+    "client_cert_path": null
+}
\ No newline at end of file
diff --git a/roles/07_user/tasks/main.yml b/roles/07_user/tasks/main.yml
index 5b69bd9..04754b9 100644
--- a/roles/07_user/tasks/main.yml
+++ b/roles/07_user/tasks/main.yml
@@ -25,3 +25,19 @@
     mode: 0440
     validate: /usr/sbin/visudo -cf %s
   become: true
+
+- name: Configure rbw
+  ansible.builtin.file:
+    path: ~/.config/rbw
+    state: directory
+    mode: '0755'
+    become: true
+    become_user: "{{ user.name }}"
+
+- name: Copy rbw-config.json
+  ansible.builtin.copy:
+    src: rbw-config.json
+    dest: ~/.config/rbw/config.json
+    mode: '0644'
+    become: true
+    become_user: "{{ user.name }}"
diff --git a/roles/08_tweaks/files/gsettings.dconf b/roles/08_tweaks/files/gsettings.dconf
index e3992c9..84247f1 100644
--- a/roles/08_tweaks/files/gsettings.dconf
+++ b/roles/08_tweaks/files/gsettings.dconf
@@ -28,4 +28,4 @@ gtk-theme='WhiteSur-Light-blue'
 monospace-font-name='Hack Nerd Font Mono 10'
 
 [org/gnome/shell/extensions/user-theme]
-name='WhiteSur-Light-blue'
\ No newline at end of file
+name='WhiteSur-Light-blue'
diff --git a/roles/08_tweaks/tasks/gnome-extensions.yml b/roles/08_tweaks/tasks/gnome-extensions.yml
index 2a0d78b..961c417 100644
--- a/roles/08_tweaks/tasks/gnome-extensions.yml
+++ b/roles/08_tweaks/tasks/gnome-extensions.yml
@@ -2,4 +2,5 @@
 - name: Install Gnome Extensions
   ansible.builtin.shell: gext --filesystem install {{ item }}
   with_items: "{{ gnome_extensions }}"
-  changed_when: true
\ No newline at end of file
+  changed_when: true
+  
\ No newline at end of file
diff --git a/scripts/setup_ssh_key.sh b/scripts/setup_ssh_key.sh
index 9d3edf5..6aae880 100755
--- a/scripts/setup_ssh_key.sh
+++ b/scripts/setup_ssh_key.sh
@@ -6,11 +6,28 @@ if [ -f "${HOME}/.ssh/id_ed25519" ]; then
 fi
 
 HOSTNAME=`hostname`
+GITHUB_TOKEN=`rbw get "Github CLI Token"`
+GITEA_TOKEN=`rbw get "Gitea CLI Token"`
 
-ssh-keygen -t ed25519 -C "$USER@$HOSTNAME"
+ssh-keygen -t ed25519 -f "${HOME}/.ssh/id_ed25519" -q -P "" -C "$USER@$HOSTNAME"
+
+gh ssh-key add "${HOME}/.ssh/id_ed25519.pub" --title "$USER@$HOSTNAME"
+
+curl -X 'POST' \
+  'https://git.devroom.io/api/v1/user/keys' \
+  -H 'accept: application/json' \
+  -H 'Content-Type: application/json' \
+  -H 'Authorization: ${GITEA_TOKEN}' \
+  -d '{
+  "key": "",
+  "read_only": false,
+  "title": "$USER@$HOSTNAME"
+}'
 
 ssh-keyscan -H git.devroom.io >> "${HOME}/.ssh/known_hosts"
 ssh-keyscan -H github.com >> "${HOME}/.ssh/known_hosts"
 
 echo "--- Your public key, sir:"
-cat "${HOME}/.ssh/id_ed25519.pub"
\ No newline at end of file
+echo "---"
+cat "${HOME}/.ssh/id_ed25519.pub"
+echo "---"
\ No newline at end of file