diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
new file mode 100644
index 0000000..46b066f
--- /dev/null
+++ b/roles/docker/defaults/main.yml
@@ -0,0 +1,4 @@
+# vim: ft=yaml.ansible
+# code: language=ansible
+---
+docker_data_root: "{{ data_fs }}/docker"
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index a26d08f..e3938e5 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -21,9 +21,16 @@
       - containerd.io
     state: present
 
+- name: Create Docker data root directory
+  ansible.builtin.file:
+    path: "{{ docker_data_root }}"
+    owner: root
+    mode: u=rwx,g=x,o=
+    state: directory
+
 - name: Copy Docker daemon config file
-  ansible.builtin.copy:
-    src: daemon.json
+  ansible.builtin.template:
+    src: daemon.json.j2
     dest: /etc/docker/daemon.json
     owner: root
     mode: u=rw,g=r,o=r
diff --git a/roles/docker/files/daemon.json b/roles/docker/templates/daemon.json.j2
similarity index 65%
rename from roles/docker/files/daemon.json
rename to roles/docker/templates/daemon.json.j2
index 9205107..47295f7 100644
--- a/roles/docker/files/daemon.json
+++ b/roles/docker/templates/daemon.json.j2
@@ -1,4 +1,6 @@
+{# code: language=ansible-jinja #}
 {
+  "data-root": "{{ docker_data_root }}",
   "default-address-pools": [
     {
       "base": "172.17.0.0/16",
diff --git a/roles/postgresql/templates/postgresql-14.service.j2 b/roles/postgresql/templates/postgresql-14.service.j2
index 8e715c8..47bce3b 100644
--- a/roles/postgresql/templates/postgresql-14.service.j2
+++ b/roles/postgresql/templates/postgresql-14.service.j2
@@ -1,5 +1,5 @@
+{# code: language=ansible-jinja #}
 # THIS FILE IS MANAGED BY ANSIBLE
-# code: language=ansible-jinja
 
 [Service]
 Environment=PGDATA={{ postgresql_pgdata }}
\ No newline at end of file