diff --git a/aptly/server/init.sls b/aptly/server/init.sls
index 632ea45..2fb6501 100644
--- a/aptly/server/init.sls
+++ b/aptly/server/init.sls
@@ -74,8 +74,8 @@
 aptly_home_dir:
   file.directory:
   - name: {{ server.home_dir }}
-  - user: aptly
-  - group: aptly
+  - user: {{ server.user.name }}
+  - group: {{ server.user.group }}
   - mode: 755
   - require:
     - user: aptly_user
@@ -83,8 +83,8 @@
 aptly_root_dir:
   file.directory:
   - name: {{ server.root_dir }}
-  - user: aptly
-  - group: aptly
+  - user: {{ server.user.name }}
+  - group: {{ server.user.group }}
   - mode: 755
   - require:
     - user: aptly_user
@@ -92,8 +92,8 @@
 aptly_pub_dir:
   file.directory:
   - name: {{ server.root_dir }}/public
-  - user: aptly
-  - group: aptly
+  - user: {{ server.user.name }}
+  - group: {{ server.user.group }}
   - require:
     - file: aptly_root_dir
 
@@ -107,8 +107,8 @@
   - name: {{ server.home_dir }}/.aptly.conf
   - source: salt://aptly/files/aptly.conf
   - template: jinja
-  - user: aptly
-  - group: aptly
+  - user: {{ server.user.name }}
+  - group: {{ server.user.group }}
   - mode: 664
   - require:
     - file: aptly_pub_dir
@@ -127,8 +127,8 @@
 aptly_gpg_key_dir:
   file.directory:
   - name: {{ server.home_dir }}/.gnupg
-  - user: aptly
-  - group: aptly
+  - user: {{ server.user.name }}
+  - group: {{ server.user.group }}
   - mode: 700
   - require:
     - file: aptly_home_dir
@@ -138,8 +138,8 @@
   file.managed:
   - name: {{ gpgprivfile }}
   - contents: {{ server.gpg.private_key|yaml }}
-  - user: aptly
-  - group: aptly
+  - user: {{ server.user.name }}
+  - group: {{ server.user.group }}
   - mode: 600
   - require:
     - file: aptly_gpg_key_dir
@@ -148,16 +148,17 @@
   file.managed:
   - name: {{ gpgpubfile }}
   - contents: {{ server.gpg.public_key|yaml }}
-  - user: aptly
-  - group: aptly
+  - user: {{ server.user.name }}
+  - group: {{ server.user.group }}
   - mode: 644
+  - makedirs: true
   - require:
     - file: aptly_gpg_key_dir
 
 import_gpg_pub_key:
   cmd.run:
   - name: gpg --no-tty --import {{ gpgpubfile }}
-  - user: aptly
+  - user: {{ server.user.name }}
   - unless: gpg --no-tty{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --list-keys | grep '{{ server.gpg.keypair_id }}'
   - require:
     - file: gpg_pub_key
@@ -166,7 +167,7 @@
 import_gpg_priv_key:
   cmd.run:
   - name: gpg --no-tty --allow-secret-key-import{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --import {{ gpgprivfile }}
-  - user: aptly
+  - user: {{ server.user.name }}
   - unless: gpg --no-tty{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --list-secret-keys | grep '{{ server.gpg.keypair_id }}'
   - require:
     - file: aptly_gpg_key_dir
diff --git a/aptly/server/mirrors.sls b/aptly/server/mirrors.sls
index b33b9bf..24ad6f9 100644
--- a/aptly/server/mirrors.sls
+++ b/aptly/server/mirrors.sls
@@ -69,6 +69,9 @@
   - unless: aptly snapshot show {{ snapshot }}
   - require:
     - cmd: aptly_{{ mirror_name }}_update
+  {%- if server.source.engine == "docker" %}
+    - file: aptly_wrapper
+  {%- endif %}
 
 {%- endfor %}
 
@@ -79,6 +82,10 @@
   - user: {{ server.user.name }}
   {%- endif %}
   - unless: aptly mirror show {{ mirror_name }}
+  {%- if server.source.engine == "docker" %}
+  - require:
+    - file: aptly_wrapper
+  {%- endif %}
 
 {%- if mirror.get('update', False) == True %}
 aptly_{{ mirror_name }}_update:
@@ -89,6 +96,9 @@
   {%- endif %}
   - require:
     - cmd: aptly_{{ mirror_name }}_mirror
+  {%- if server.source.engine == "docker" %}
+    - file: aptly_wrapper
+  {%- endif %}
 {%- endif %}
 
 {%- if mirror.publish is defined %}
@@ -98,6 +108,10 @@
   {%- if server.source.engine != "docker" %}
   - user: {{ server.user.name }}
   {%- endif %}
+  {%- if server.source.engine == "docker" %}
+  - require:
+    - file: aptly_wrapper
+  {%- endif %}
 {% endif %}
 
 {%- endfor %}
diff --git a/aptly/server/repos.sls b/aptly/server/repos.sls
index 05e224c..c486895 100644
--- a/aptly/server/repos.sls
+++ b/aptly/server/repos.sls
@@ -7,29 +7,35 @@
   - name: aptly repo create -distribution="{{ repo.distribution }}" -component="{{ repo.component }}" -architectures="{{ repo.architectures }}" -comment="{{ repo.comment }}" {{ repo_name }}
   - unless: aptly repo show {{ repo_name }}
   {%- if server.source.engine != "docker" %}
-  - user: aptly
+  - user: {{ server.user.name }}
   {%- endif %}
   - require:
     - file: aptly_conf
+  {%- if server.source.engine == "docker" %}
+    - file: aptly_wrapper
+  {%- endif %}
 
 {%- if repo.pkg_dir is defined and repo.pkg_dir %}
 
 pkgdir:
   file.directory:
   - name: {{ repo.pkg_dir }}
-  - user: aptly
-  - group: aptly
+  - user: {{ server.user.name }}
+  - group: {{ server.user.group }}
   - makedirs: true
 
 aptly_{{ repo_name }}_pkgs_add:
   cmd.run:
   - name: aptly repo add {{ repo_name }} {{ repo.pkg_dir }}
   {%- if server.source.engine != "docker" %}
-  - user: aptly
+  - user: {{ server.user.name }}
   {%- endif %}
   - require:
     - cmd: aptly_{{ repo_name }}_repo_create
     - file: pkgdir
+  {%- if server.source.engine == "docker" %}
+    - file: aptly_wrapper
+  {%- endif %}
 
 {%- endif %}
 
@@ -38,9 +44,13 @@
   cmd.run:
   - name: aptly publish repo -batch=true -gpg-key='{{ server.gpg.keypair_id }}' -passphrase='{{ server.gpg.passphrase }}' {{ repo_name }}
   {%- if server.source.engine != "docker" %}
-  - user: aptly
+  - user: {{ server.user.name }}
   {%- endif %}
   - unless: aptly publish update -batch=true -gpg-key='{{ server.gpg.keypair_id }}' -passphrase='{{ server.gpg.passphrase }}' {{ repo.distribution }}
 {%- endif %}
+  {%- if server.source.engine == "docker" %}
+  - require:
+    - file: aptly_wrapper
+  {%- endif %}
 
 {%- endfor %}