diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index c8bddf0..5320da9 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -2,28 +2,35 @@
 - name: Deploy Brainwave ARM to OrangePi
   hosts: orangepi
   gather_facts: false
+  # Requires: SSH user must be in the 'docker' group on the OrangePi.
+  # If not, set 'become: true' on the Load Docker image and Start container tasks.
+  vars:
+    deploy_dir: "/home/{{ ansible_user }}/brainwave"
 
   tasks:
     - name: Ensure deploy directory exists
-      file:
-        path: /home/user/brainwave
+      ansible.builtin.file:
+        path: "{{ deploy_dir }}"
         state: directory
         mode: '0755'
 
     - name: Copy ARM tarball
-      copy:
+      ansible.builtin.copy:
         src: "{{ artifact_path }}/brainwave-arm64.tar.gz"
-        dest: /home/user/brainwave/brainwave-arm64.tar.gz
+        dest: "{{ deploy_dir }}/brainwave-arm64.tar.gz"
 
-    - name: Copy docker-compose file
-      copy:
+    - name: Copy ARM docker-compose file
+      ansible.builtin.copy:
         src: "{{ artifact_path }}/docker-compose.arm64.yml"
-        dest: /home/user/brainwave/docker-compose.yml
+        dest: "{{ deploy_dir }}/docker-compose.yml"
 
     - name: Load Docker image
-      command: docker load -i /home/user/brainwave/brainwave-arm64.tar.gz
+      ansible.builtin.command: docker load -i {{ deploy_dir }}/brainwave-arm64.tar.gz
+      register: docker_load_result
+      changed_when: "'Loaded image' in docker_load_result.stdout"
 
     - name: Start container
-      command: docker compose up -d
+      ansible.builtin.command: docker compose up -d
       args:
-        chdir: /home/user/brainwave
+        chdir: "{{ deploy_dir }}"
+      changed_when: true