diff --git a/Makefile b/Makefile
index 66737a6f4..5cb2886b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 .SHELLFLAGS += -x -e
 PWD = $(shell pwd)
+UID = $(shell id -u)
+GID = $(shell id -g)
 
 all: lint-fix lint test gen
 
@@ -31,6 +33,7 @@ gen-build:
 gen-web:
 	docker run \
 		--rm -v ${PWD}:/local \
+		--user ${UID}:${GID} \
 		openapitools/openapi-generator-cli generate \
 		-i /local/schema.yml \
 		-g typescript-fetch \
@@ -41,6 +44,7 @@ gen-web:
 gen-outpost:
 	docker run \
 		--rm -v ${PWD}:/local \
+		--user ${UID}:${GID} \
 		openapitools/openapi-generator-cli generate \
 		--git-host goauthentik.io \
 		--git-repo-id outpost \
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a8c22ddbb..090b21af0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -299,7 +299,6 @@ stages:
             inputs:
               script: |
                 make gen-web
-                sudo chmod 777 -R web/api/
                 cd web
                 cd api && npm i && cd ..
                 npm i