diff --git a/packages/client-go/.openapi-generator-ignore b/packages/client-go/.openapi-generator-ignore
index 6db33941e3..9edfecd641 100644
--- a/packages/client-go/.openapi-generator-ignore
+++ b/packages/client-go/.openapi-generator-ignore
@@ -1,2 +1,9 @@
 go.mod
 go.sum
+.gitignore
+.travis.yml
+README.md
+api/**
+docs/**
+git_push.sh
+test/**
diff --git a/packages/client-go/Makefile b/packages/client-go/Makefile
index 6cd944a35e..dc3fb3192b 100644
--- a/packages/client-go/Makefile
+++ b/packages/client-go/Makefile
@@ -11,15 +11,5 @@ build:
 		-g go \
 		-o local \
 		-c /local/config.yaml
-	rm -rf \
-		"${PWD}/.gitignore" \
-		"${PWD}/.openapi-generator" \
-		"${PWD}/.travis.yml" \
-		"${PWD}/README.md" \
-		"${PWD}/api" \
-		"${PWD}/docs" \
-		"${PWD}/git_push.sh" \
-		"${PWD}/test" \
-		"${PWD}/go.mod" \
-		"${PWD}/go.sum"
+	rm -rf "${PWD}/.openapi-generator"
 	go fmt .
diff --git a/packages/client-rust/.openapi-generator-ignore b/packages/client-rust/.openapi-generator-ignore
index cf96d6b3f1..12de6b7814 100644
--- a/packages/client-rust/.openapi-generator-ignore
+++ b/packages/client-rust/.openapi-generator-ignore
@@ -1 +1,7 @@
 Cargo.toml
+.gitignore
+.openapi-generator/**
+docs/**
+git_push.sh
+.travis.yml
+README.md
diff --git a/packages/client-rust/Makefile b/packages/client-rust/Makefile
index d18d9ede28..097941f19f 100644
--- a/packages/client-rust/Makefile
+++ b/packages/client-rust/Makefile
@@ -3,13 +3,6 @@ PWD = $(shell pwd)
 UID = $(shell id -u)
 GID = $(shell id -g)
 
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Darwin)
-	SED_INPLACE = sed -i ''
-else
-	SED_INPLACE = sed -i
-endif
-
 build:
 ifndef version
 	$(error Usage: make build version=20xx.xx.xx)
@@ -22,11 +15,5 @@ endif
 		-o local \
 		-c /local/config.yaml \
 		--additional-properties=packageVersion=$(version)
-	$(SED_INPLACE) 's/models::models::/models::/g' ${PWD}/src/apis/*
-	rm -rf \
-		"${PWD}/.gitignore" \
-		"${PWD}/.openapi-generator" \
-		"${PWD}/.travis.yml" \
-		"${PWD}/docs" \
-		"${PWD}/git_push.sh" \
-		"${PWD}/README.md"
+	sed -i 's/models::models::/models::/g' ${PWD}/src/apis/*
+	rm -rf "${PWD}/.openapi-generator"
diff --git a/packages/client-ts/.openapi-generator-ignore b/packages/client-ts/.openapi-generator-ignore
index 6c7b69a015..f2a6cdf040 100644
--- a/packages/client-ts/.openapi-generator-ignore
+++ b/packages/client-ts/.openapi-generator-ignore
@@ -1 +1,4 @@
 .gitignore
+.npmignore
+docs/**
+README.md
diff --git a/packages/client-ts/Makefile b/packages/client-ts/Makefile
index 7e9612b1ed..bed612c359 100644
--- a/packages/client-ts/Makefile
+++ b/packages/client-ts/Makefile
@@ -14,8 +14,4 @@ build:
 		--additional-properties=npmVersion=0.0.0 \
 		--git-repo-id authentik \
 		--git-user-id goauthentik
-	rm -rf \
-		.npmignore \
-		.openapi-generator \
-		docs \
-		README.md
+	rm -rf "${PWD}/.openapi-generator"