diff --git a/Makefile b/Makefile
index 87ef02800..ee7701dd5 100644
--- a/Makefile
+++ b/Makefile
@@ -150,15 +150,14 @@ docs: readme hook-docs scanner-docs operator-docs auto-discovery-docs demo-apps-
 .PHONY: create-new-scanner
 create-new-scanner: ## Creates templates for a new scanner, pass NAME=NEW-SCANNER
 ifdef NAME
-	@mkdir scanners/$(NAME) ; \
-	rsync -a ./.templates/new-scanner/ ./scanners/$(NAME) ; \
-	echo "Copied template files to new directory ./scanners/$(NAME)"; \
-	cd scanners/$(NAME) ; \
-	find . -type f -exec sed -i 's/new-scanner/$(NAME)/g' {} + ; \
-	mv "./templates/new-scanner-parse-definition.yaml" "templates/$(NAME)-parse-definition.yaml" ; \
-	mv "./templates/new-scanner-scan-type.yaml" "templates/$(NAME)-scan-type.yaml" ;
+	cp -r ./.templates/new-scanner ./scanners/$(NAME)
+	find ./scanners/$(NAME) -type f ! -name 'tmp' \
+		-exec sed -n 's/new-scanner/$(NAME)/g;w ./scanners/$(NAME)/tmp' {} \; \
+		-exec mv ./scanners/$(NAME)/tmp {} \;
+	mv ./scanners/$(NAME)/templates/new-scanner-parse-definition.yaml ./scanners/$(NAME)/templates/$(NAME)-parse-definition.yaml
+	mv ./scanners/$(NAME)/templates/new-scanner-scan-type.yaml ./scanners/$(NAME)/templates/$(NAME)-scan-type.yaml
 else
-	@echo "Scanner name not defined, please provide via make create-new-scanner NAME=NEW-SCANNER";
+	@echo "Scanner name not defined, please provide via make create-new-scanner NAME=NEW-SCANNER"
 endif
 
 .PHONY: