diff --git a/roles/docker-distribution/tasks/main.yml b/roles/docker-distribution/tasks/main.yml
index 181f565..6c348ca 100644
--- a/roles/docker-distribution/tasks/main.yml
+++ b/roles/docker-distribution/tasks/main.yml
@@ -4,6 +4,39 @@
     name: docker-distribution
     state: installed
 
+- name: create docker group
+  group:
+    name: docker
+    gid: 1004
+
+- name: create docker user
+  user:
+    name: docker
+    comment: Service Docker-Registry
+    createhome: false
+    group: docker
+    groups: hostkey
+    home: /var/empty
+    shell: /sbin/nologin
+    uid: 1004
+
+- name: create unit file drop-in directory
+  file:
+    path: /etc/systemd/system/docker-distribution.service.d
+    state: directory
+    mode: 0755
+    owner: root
+    group: "{{ ansible_wheel }}"
+
+- name: create unit file drop-in
+  copy:
+    dest: /etc/systemd/system/docker-distribution.service.d/user.conf
+    src: user.conf
+    mode: 0644
+    owner: root
+    group: "{{ ansible_wheel }}"
+  notify: restart docker-distribution
+
 - name: create config file
   template:
     dest: /etc/docker-distribution/registry/config.yml