diff --git a/teamcity.server/defaults/main.yml b/teamcity.server/defaults/main.yml
index 2413b91..6a84258 100644
--- a/teamcity.server/defaults/main.yml
+++ b/teamcity.server/defaults/main.yml
@@ -1,5 +1,5 @@
 teamcity_server__image_name: "jetbrains/teamcity-server"
-teamcity_server__image_tag: "2019.1.1"
+teamcity_server__image_tag: "2021.1"
 teamcity_server__image: "{{ teamcity_server__image_name }}:{{ teamcity_server__image_tag }}"
 
 teamcity_server__default_labels:
diff --git a/teamcity.server/templates/docker-compose.yml.j2 b/teamcity.server/templates/docker-compose.yml.j2
index 2e60d35..a1491cf 100644
--- a/teamcity.server/templates/docker-compose.yml.j2
+++ b/teamcity.server/templates/docker-compose.yml.j2
@@ -4,6 +4,7 @@ services:
   teamcity-server:
     container_name: teamcity-server
     image: "{{ teamcity_server__image }}"
+    user: root
     restart: unless-stopped
     networks: {{ teamcity_server.docker.networks | default([]) | to_json }}
     labels: {{ teamcity_server.docker.labels | default(teamcity_server__default_labels) | to_json }}