diff --git a/ansible/group_vars/docker.yml b/ansible/group_vars/docker.yml
index fa133d8..f2a9205 100644
--- a/ansible/group_vars/docker.yml
+++ b/ansible/group_vars/docker.yml
@@ -1,3 +1,7 @@
 docker_install_compose: false
 docker_users_obj: "{{ users|selectattr('docker', 'defined') }}"
 docker_users: "{{ docker_users_obj|map(attribute='username') }}"
+
+docker_daemon_options:
+    log-driver: "journald"
+    log-opts: { "mode": "non-blocking" }
diff --git a/ansible/run.yml b/ansible/run.yml
index 658eb9a..1b3e352 100644
--- a/ansible/run.yml
+++ b/ansible/run.yml
@@ -67,7 +67,7 @@
 
 - hosts: docker
   become: yes
-  tags: [never, init, docker]
+  tags: [docker]
   vars_files:
     - "vars/vault.yml"
   post_tasks:
@@ -75,7 +75,29 @@
       ansible.builtin.pip:
         name:
           - docker
-          - docker-compose
+
+    - name: Get DEB architecture
+      shell: dpkg --print-architecture
+      register: deb_architecture
+
+    - name: Create plugin directory if not present
+      ansible.builtin.file:
+        path: "/home/{{ item.username }}/.docker/cli-plugins/"
+        state: directory
+        owner: "{{ item.username }}"
+        group: "{{ item.groupname }}"
+        mode: "0775"
+      loop: "{{ docker_users_obj }}"
+
+    - name: Install compose plugin
+      ansible.builtin.get_url:
+        url: "https://github.com/docker/compose-cli/releases/download/v2.0.0-rc.1/docker-compose-linux-{{ deb_architecture.stdout }}"
+        dest: "/home/{{ item.username }}/.docker/cli-plugins/docker-compose"
+        mode: "0755"
+        owner: "{{ item.username }}"
+        group: "{{ item.groupname }}"
+      loop: "{{ docker_users_obj }}"
+
   roles:
     - role: geerlingguy.docker