diff --git a/roles/docker/tasks/conf.yml b/roles/docker/tasks/conf.yml
index 80c9e50..e96d715 100644
--- a/roles/docker/tasks/conf.yml
+++ b/roles/docker/tasks/conf.yml
@@ -58,3 +58,10 @@
   systemd: daemon_reload=True
   when: docker_socket_unit.changed or docker_service_unit.changed or docker_old_unit.changed
   tags: docker
+
+- name: Fix the dockremap UID namespace
+  lineinfile: path=/etc/{{ item }} regexp='^dockremap\s.*' line='dockremap:100000:65536'
+  loop:
+    - subuid
+    - subgid
+  tags: docker