diff --git a/defaults/main.yml b/defaults/main.yml
index 93470f8..4f54f85 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,9 +1,8 @@
 ---
 github_webhook_service_user: 'github'
 github_webhook_service_user_groups: ['www-data']
+github_webhook_service_user_uid: 1500
 github_webhook_service_name: '{{ github_webhook_service_user }}-webhook'
-# Has to be the UID of Airflow user on the host.
-github_webhook_service_user_uid: 150000
 
 github_webhook_home: '/home/{{ github_webhook_service_user }}'
 github_webhook_venv_path: '{{ github_webhook_home }}/venv'
diff --git a/tasks/user.yml b/tasks/user.yml
index 0407b98..145a3e9 100644
--- a/tasks/user.yml
+++ b/tasks/user.yml
@@ -2,7 +2,7 @@
 - name: Create webhook group
   group:
     name: '{{ github_webhook_service_user }}'
-    gid: '{{ github_webhook_service_user_uid }}'
+    gid:  '{{ github_webhook_service_user_uid }}'
 
 - name: Create webhook user
   user:
@@ -15,7 +15,7 @@
 
 - name: Create SSH config directory
   file:
-    path: '{{ github_webhook_home }}/.ssh'
+    path:  '{{ github_webhook_home }}/.ssh'
     owner: '{{ github_webhook_service_user }}'
     group: '{{ github_webhook_service_user }}'
     state: 'directory'
@@ -35,6 +35,6 @@
 
 - name: Update give webhook user permission to directory
   file:
-    path: '{{ github_webhook_dest_path }}' 
+    path:  '{{ github_webhook_dest_path }}'
     owner: '{{ github_webhook_service_user }}'
     group: '{{ github_webhook_service_user }}'