diff --git a/roles/essential/tasks/main.yml b/roles/essential/tasks/main.yml
index 46b7099..6f682d3 100644
--- a/roles/essential/tasks/main.yml
+++ b/roles/essential/tasks/main.yml
@@ -18,9 +18,10 @@
       - zsh # :D
       - python3-certbot-nginx
 
-# TODO: make idempotent
-- name: Setup default shell (zsh)
-  shell: chsh -s /usr/bin/zsh
+- name: Setup zsh
+  user:
+    name: "{{ ansible_user }}"
+    shell: /usr/bin/zsh
 
 - name: Clone Powerlevel10k theme
   git:
diff --git a/roles/tor/tasks/main.yml b/roles/tor/tasks/main.yml
index 88c0509..1bee4ce 100644
--- a/roles/tor/tasks/main.yml
+++ b/roles/tor/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Install torrc
   template:
-    src: torrc
+    src: templates/torrc
     dest: /etc/tor/torrc
     owner: root
     group: root