diff --git a/roles/hedgedoc/defaults/main/user.yml b/roles/hedgedoc/defaults/main/user.yml
index 0452fb7..90a5c95 100644
--- a/roles/hedgedoc/defaults/main/user.yml
+++ b/roles/hedgedoc/defaults/main/user.yml
@@ -1,5 +1,5 @@
 ---
 hedgedoc_run_user_id: >-2
-  {{ hedgedoc_user_info.uid | default(hedgedoc_user }}
+  {{ hedgedoc_user_info.uid | default(hedgedoc_user) }}
 hedgedoc_run_group_id: >-2
-  {{ hedgedoc_user_info.group | default(hedgedoc_user }}
+  {{ hedgedoc_user_info.group | default(hedgedoc_user) }}
diff --git a/roles/hedgedoc/tasks/deploy-docker.yml b/roles/hedgedoc/tasks/deploy-docker.yml
index 91fc7e9..6de563f 100644
--- a/roles/hedgedoc/tasks/deploy-docker.yml
+++ b/roles/hedgedoc/tasks/deploy-docker.yml
@@ -17,6 +17,8 @@
     name: "{{ hedgedoc_container_name }}"
     image: "{{ hedgedoc_container_image }}"
     env: "{{ hedgedoc_container_env | default(omit, true) }}"
+    user: "{{ hedgedoc_container_user | default(omit, true) }}"
+    ports: "{{ hedgedoc_container_ports | default(omit, true) }}"
     labels: "{{ hedgedoc_container_all_labels }}"
     volumes: "{{ hedgedoc_container_all_volumes }}"
     etc_hosts: "{{ hedgedoc_container_etc_hosts | default(omit, true) }}"