diff --git a/roles/services/tasks/discord_bot.yaml b/roles/services/tasks/discord_bot.yaml
index 4d742f6..3ce4308 100644
--- a/roles/services/tasks/discord_bot.yaml
+++ b/roles/services/tasks/discord_bot.yaml
@@ -2,7 +2,9 @@
 
 - name: Install dependencies
   ansible.builtin.apt:
-    name: virtualenv
+    name:
+      - openscad
+      - virtualenv
 
 - name: Create virtualenv
   ansible.builtin.command:
@@ -10,14 +12,21 @@
   args:
     creates: /var/lib/discord-bot/.venv
 
-- name: Clone source
+- name: Clone bottleclip source
+  ansible.builtin.git:
+    repo: https://git.bitlair.nl/bitlair/bottle-clip.git
+    version: main
+    dest: /var/lib/bottle-clip
+    accept_hostkey: yes
+  notify: Restart discord-bot
+
+- name: Clone discord-bot source
   ansible.builtin.git:
     repo: https://git.bitlair.nl/bitlair/discord-bot.git
     version: main
     dest: /var/lib/discord-bot
     accept_hostkey: yes
   notify: Restart discord-bot
-  ignore_errors: true
 
 - name: Install Python dependencies
   ansible.builtin.shell:
diff --git a/roles/services/templates/discord-bot.service b/roles/services/templates/discord-bot.service
index ccac806..7522fd9 100644
--- a/roles/services/templates/discord-bot.service
+++ b/roles/services/templates/discord-bot.service
@@ -13,7 +13,7 @@ DynamicUser=true
 Environment="MQTT_HOST={{ mqtt_internal_host }}"
 Environment="DISCORD_WEBHOOK_URL={{ lookup('passwordstore', 'services/discord', subkey='webhook_url') }}"
 Environment="DISCORD_TOKEN={{ lookup('passwordstore', 'services/discord', subkey='token') }}"
-Environment="BOTTLECLIP_GIT_TOKEN={{ lookup('passwordstore', 'services/discord', subkey='bottleclip_git_token') }}"
+Environment="BOTTLECLIP_RESOURCES=/var/lib/bottle-clip"
 
 [Install]
 WantedBy=multi-user.target