diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml
index 153735a..f4934a6 100644
--- a/tasks/Darwin.yml
+++ b/tasks/Darwin.yml
@@ -3,7 +3,7 @@
     name: "{{ az_devops_agent_user }}"
     comment: "Azure DevOps Agent"
     shell: /bin/zsh
-    group: admin
+    group: "{{ az_devops_agent_group }}"
   become: true
 
 - name: Create directories
@@ -103,6 +103,7 @@
 - name: Uninstall agent service
   command: ./svc.sh uninstall
   become: true
+  become_user: "{{ az_devops_agent_user }}"
   args:
     chdir: "{{ az_devops_agent_folder }}"
     removes: "{{ az_devops_agent_folder }}/runsvc.sh"
diff --git a/tasks/Linux.yml b/tasks/Linux.yml
index 7b84ffe..c7fb683 100644
--- a/tasks/Linux.yml
+++ b/tasks/Linux.yml
@@ -1,6 +1,7 @@
 - name: Add an agent user
   user:
     name: "{{ az_devops_agent_user }}"
+    group: "{{ az_devops_agent_group }}"
     comment: "Azure DevOps Agent"
     shell: /bin/bash
   become: true