diff --git a/build/ansible/roles/pmm2-images/tasks/main.yml b/build/ansible/roles/pmm2-images/tasks/main.yml
index 6fed510de7..61807dc69c 100644
--- a/build/ansible/roles/pmm2-images/tasks/main.yml
+++ b/build/ansible/roles/pmm2-images/tasks/main.yml
@@ -100,10 +100,10 @@
         non_unique: true
       loop:
         - { name: pmm, gid: 1000 }
+        - { name: pmm-agent, gid: 1001 }
         - { name: nginx, gid: 999 }
         - { name: grafana, gid: 998 }
         - { name: clickhouse, gid: 997 }
-        - { name: pmm-agent, gid: 996 }
 
     - name: Create users              | Create users
       user:
@@ -116,10 +116,10 @@
         non_unique: true
       loop:
         - { name: pmm, uid: 1000, comment: "PMM Server", shell: "/bin/false", home: "/home/pmm", group: pmm, }
+        - { name: pmm-agent, uid: 1001, comment: "pmm-agent", shell: "/bin/false", home: "/usr/local/percona/", group: pmm-agent, }
         - { name: nginx, uid: 999, comment: "nginx user", shell: "/sbin/nologin", home: "/var/cache/nginx", group: nginx, }
         - { name: grafana, uid: 998, comment: "Grafana Dashboard", shell: "/sbin/nologin", home: "/etc/grafana", group: grafana, }
         - { name: clickhouse, uid: 997, comment: "Clickhouse server", shell: "/sbin/nologin", home: "/var/lib/clickhouse", group: clickhouse, }
-        - { name: pmm-agent, uid: 996, comment: "pmm-agent", shell: "/bin/false", home: "/usr/local/percona/", group: pmm-agent, }
   when: ansible_virtualization_type == "docker"
 
 - name: Create directories        | Create dirs
diff --git a/build/docker/server/create_users.sh b/build/docker/server/create_users.sh
index 7cf342d344..25731a0784 100644
--- a/build/docker/server/create_users.sh
+++ b/build/docker/server/create_users.sh
@@ -2,10 +2,10 @@
 
 users=(
   "pmm:1000:/bin/false:/home/pmm:pmm"
+  "pmm-agent:1001:/bin/false:/usr/local/percona/:pmm-agent"
   "nginx:999:/sbin/nologin:/var/cache/nginx:nginx"
   "grafana:998:/sbin/nologin:/etc/grafana:grafana"
   "clickhouse:997:/sbin/nologin:/var/lib/clickhouse:clickhouse"
-  "pmm-agent:996:/bin/false:/usr/local/percona/:pmm-agent"
 )
 
 for user in "${users[@]}"; do
diff --git a/managed/services/supervisord/pmm_config.go b/managed/services/supervisord/pmm_config.go
index fbe7f2b51f..361fe66100 100644
--- a/managed/services/supervisord/pmm_config.go
+++ b/managed/services/supervisord/pmm_config.go
@@ -181,6 +181,7 @@ redirect_stderr = true
 [program:pmm-agent]
 priority = 15
 command = /usr/sbin/pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml
+user = pmm-agent
 autorestart = true
 autostart = true
 startretries = 1000
diff --git a/managed/testdata/supervisord.d/pmm-db_disabled.ini b/managed/testdata/supervisord.d/pmm-db_disabled.ini
index b45251ab1f..f332cbccc8 100644
--- a/managed/testdata/supervisord.d/pmm-db_disabled.ini
+++ b/managed/testdata/supervisord.d/pmm-db_disabled.ini
@@ -76,6 +76,7 @@ redirect_stderr = true
 [program:pmm-agent]
 priority = 15
 command = /usr/sbin/pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml
+user = pmm-agent
 autorestart = true
 autostart = true
 startretries = 1000
diff --git a/managed/testdata/supervisord.d/pmm-db_enabled.ini b/managed/testdata/supervisord.d/pmm-db_enabled.ini
index 4d4ad4afd9..e0766b322d 100644
--- a/managed/testdata/supervisord.d/pmm-db_enabled.ini
+++ b/managed/testdata/supervisord.d/pmm-db_enabled.ini
@@ -100,6 +100,7 @@ redirect_stderr = true
 [program:pmm-agent]
 priority = 15
 command = /usr/sbin/pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml
+user = pmm-agent
 autorestart = true
 autostart = true
 startretries = 1000