diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg
index 7012983..57b9b55 100644
--- a/ansible/ansible.cfg
+++ b/ansible/ansible.cfg
@@ -1,6 +1,6 @@
 [defaults]
 inventory = ./hosts.ini
-#interpreter_python = auto_silent # Disables "Using discovered python interpreter" warning
+interpreter_python = auto_silent
 
 [privilege_escalation]
 become_ask_pass = True
diff --git a/ansible/host_vars/pve/main.yml b/ansible/host_vars/pve/main.yml
index e69de29..a03e94e 100644
--- a/ansible/host_vars/pve/main.yml
+++ b/ansible/host_vars/pve/main.yml
@@ -0,0 +1 @@
+ansible_user: root
diff --git a/ansible/main.yml b/ansible/main.yml
index a81d0fd..fff14d4 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -1,10 +1,8 @@
 - hosts: pve
   roles:
     - pve
-      
+
 - hosts: pve-docker
   roles:
-    - role: geerlingguy.docker
-      become: true
-      vars:
-        docker_users: "{{ primary_user }}"
+    - docker-compose
+  become: true
diff --git a/ansible/roles/docker-compose/tasks/main.yml b/ansible/roles/docker-compose/tasks/main.yml
new file mode 100644
index 0000000..6a7b119
--- /dev/null
+++ b/ansible/roles/docker-compose/tasks/main.yml
@@ -0,0 +1,21 @@
+- name: Install docker
+  ansible.builtin.package:
+    name: docker
+    state: present
+
+- name: Add user to docker group
+  ansible.builtin.user:
+    name: "{{ primary_user }}"
+    groups: docker
+    append: true
+
+- name: Start Docker daemon at boot
+  ansible.builtin.service:
+    name: docker
+    enabled: yes
+    state: started
+
+- name: Install docker compose
+  ansible.builtin.package:
+    name: docker-compose
+    state: present
diff --git a/ansible/roles/pve/tasks/media-share.yml b/ansible/roles/pve/tasks/media-share.yml
index 3c8332d..1090444 100644
--- a/ansible/roles/pve/tasks/media-share.yml
+++ b/ansible/roles/pve/tasks/media-share.yml
@@ -3,15 +3,14 @@
     name: media
     system: true
     state: present
-    register: media_gid
-  become: true
+  register: media_gid
 
 - name: Set media directory permissions
   ansible.builtin.file:
-    path: "{{ mergerfs_mountpoint }}/data"
+    path: "{{ media_storage_mnt }}/data"
     state: directory
-    owner: {{ primary_gid }}
-    group: {{ media_gid }}
+    owner: "{{ primary_gid }}"
+    group: media
     mode: 0775
     recurse: yes
   become: true